svn commit: r616951 [2/2] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/c
Locked
 
|
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=616951&r1=616950&r2=616951&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Jan 30 15:23:11 2008 @@ -73,7 +73,20 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAvailableInternalOrganizations}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -93,8 +106,34 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <include-form name="ListGlAccountOrganization" location="component://accounting/widget/GlSetupForms.xml"/> - <include-form name="AssignGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingChartOfAcctsMenu}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListGlAccountOrganization" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingChartOfAcctsMenu}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AssignGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -129,12 +168,48 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <label style="head1">${uiLabelMap.AccountingOpenTimePeriods}</label> - <include-form name="ListOpenTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> - <label style="head1">${uiLabelMap.AccountingClosedTimePeriods}</label> - <include-form name="ListClosedTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> - <label style="head1">${uiLabelMap.CommonNew}</label> - <include-form name="CreateTimePeriod" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingOpenTimePeriods}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListOpenTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingClosedTimePeriods}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListClosedTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.CommonNew}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateTimePeriod" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -156,7 +231,20 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <include-form name="PartyAcctgPreference" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPreference}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="PartyAcctgPreference" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -183,9 +271,34 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/> - <label style="head1">${uiLabelMap.AccountingUpdateFX}</label> - <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFX}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingUpdateFX}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -204,8 +317,34 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <include-form name="ListGlJournals" location="component://accounting/widget/GlSetupForms.xml"/> - <include-form name="EditGlJournal" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingGlJournals}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListGlJournals" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingGlJournals}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditGlJournal" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -225,10 +364,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListGlAccountTypeDefaults" location="component://accounting/widget/GlSetupForms.xml"/> - <container><label style="head1">${uiLabelMap.CommonAdd}</label></container> - <include-form name="EditGlAccountTypeDefault" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingGlAccountTypeDefaults}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListGlAccountTypeDefaults" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.CommonAdd}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditGlAccountTypeDefault" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -239,8 +401,8 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="titleProperty" value="AccountingGlAccountAssignments"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlAccountAssignments}"/> + <set field="titleProperty" value="AccountingInvoiceSales"/> + <set field="labelTitleProperty" value="${uiLabelMap.AccountingInvoiceSales}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountSalInvoice"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> @@ -248,11 +410,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <container><label style="head1">${uiLabelMap.AccountingSalesInvoiceToRevenue}</label></container> - <include-form name="ListSalInvoiceItemTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> - <container><label style="head1">${uiLabelMap.AccountingAssignSalesInvoiceToRevenue}</label></container> - <include-form name="AddSalInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingSalesInvoiceToRevenue}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListSalInvoiceItemTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAssignSalesInvoiceToRevenue}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddSalInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -264,6 +448,7 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="AccountingInvoicePurchase"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountPurInvoice"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> @@ -271,13 +456,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <container><label style="head1">Purchase Invoice type to Expense GL Account Number assignmentlist</label></container> - <container> - <include-form name="ListPurInvoiceItemTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPurchaseInvoiceToRevenue}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPurInvoiceItemTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAssignPurchaseInvoiceToRevenue}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPurInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <container><label style="head1">Assign Purchase Invoice Item type to Expense GL Account Number</label></container> - <include-form name="AddPurInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -288,6 +493,7 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypePaymentType"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> @@ -295,11 +501,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <container><label style="head1">Payment type to GL Account type assignment list</label></container> - <include-form name="ListPaymentTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> - <container><label style="head1">Assign Payment type to GL Account Type</label></container> - <include-form name="AddPaymentTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPaymentTypeAssigmentList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPaymentTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPaymentTypeAssignAccountType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPaymentTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -310,6 +538,7 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountNrPaymentMethod"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> @@ -317,11 +546,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <container><label style="head1">Payment methods to GL Account numbers assigmentlist</label></container> - <include-form name="ListPaymentMethodTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> - <container><label style="head1">Assign Payment method type to GL Account number></label></container> - <include-form name="AddPaymentMethodTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPaymentMethodAssigmentList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPaymentMethodTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingPaymentMethodAssignAccountType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPaymentMethodTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -353,12 +604,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListProductGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.ProductAddGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingProductGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListProductGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductAddGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProductGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddProductGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -391,12 +663,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListFinAccountTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.AccountingAddFinAccountTypeGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingFinAccountTypeGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFinAccountTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAddFinAccountTypeGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddFinAccountTypeGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddFinAccountTypeGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -430,12 +723,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListProductCategoryGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.ProductAddCategoryGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingProductCategoryGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListProductCategoryGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductAddCategoryGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProductCategoryGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddProductCategoryGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -447,10 +761,10 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="titleProperty" value="VarianceReasonGlAccount"/> + <set field="titleProperty" value="AccountingVarianceReasonGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="VarianceReasonGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.VarianceReasonGlAccount}"/> + <set field="labelTitleProperty" value="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> <entity-condition entity-name="VarianceReasonGlAccount" list-name="varianceReasonGlAccounts"> @@ -465,12 +779,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListVarianceReasonGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.VarianceReasonGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListVarianceReasonGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddVarianceReasonGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddVarianceReasonGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -482,10 +817,10 @@ <section> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="titleProperty" value="CreditCardTypeGlAccounts"/> + <set field="titleProperty" value="AccountingCreditCardTypeGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="CreditCardTypeGlAccount"/> - <set field="labelTitleProperty" value="${uiLabelMap.CreditCardTypeGlAccount}"/> + <set field="labelTitleProperty" value="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> <entity-condition entity-name="CreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts"> <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/> @@ -498,12 +833,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListCreditCardTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.ProductAddCategoryGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListCreditCardTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddCreditCardTypeGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddCreditCardTypeGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -518,7 +874,7 @@ <set field="titleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="TaxAuthorityGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingEditTaxAuthorityGlAccounts}"/> + <set field="labelTitleProperty" value="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> <entity-condition entity-name="TaxAuthorityGlAccount" list-name="taxAuthorityGlAccounts"> <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/> @@ -534,12 +890,33 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListTaxAuthorityGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head1">${uiLabelMap.AccountingAddTaxAuthorityGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListTaxAuthorityGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAddTaxAuthorityGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddTaxAuthorityGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddTaxAuthorityGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -568,16 +945,37 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container> - <include-form name="ListPartyGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> - <container> - <label style="head2">${uiLabelMap.AccountingAddPartyGlAccount}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditPartyGlAccounts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPartyGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AccountingAddPartyGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddPartyGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> + </widgets> + </section> </container> - <include-form name="AddPartyGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=616951&r1=616950&r2=616951&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Wed Jan 30 15:23:11 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="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization"> + <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="GlAccountOrganization"/> <set field="noConditionFind" value="Y"/> @@ -38,10 +39,8 @@ <!-- Displays the form for assigning accounts to a party or company --> <!-- TODO: Localize field names --> - <form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account"> - - <!-- field name="glAccountId" title="Edit" widget-style="buttontext" --> - + <form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account" + header-row-style="header-row" default-table-style="basic-table"> <field name="glAccountId"> <drop-down> <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}"> @@ -62,7 +61,8 @@ <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListGlAccount" list-name="listIt" target="" title="" type="list" default-entity-name="GlAccount"> + <form name="ListGlAccount" list-name="listIt" target="" title="" type="list" default-entity-name="GlAccount" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="GlAccount"/> <set field="noConditionFind" value="Y"/> @@ -88,7 +88,8 @@ <field name="postedBalance" widget-area-style="align-text" title-area-style="align-text"><display type="currency" currency="${defaultCurrencyUomId}"/></field> </form> - <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount"> + <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="glAccount==null" target="createGlAccount"/> <auto-fields-service service-name="updateGlAccount" map-name=""/> @@ -138,7 +139,8 @@ </form> <!-- this is used to list AcctgTransEntries and can be called either by using an acctgTransId or a glAccountId --> - <form name="ListAcctgTransEntries" type="list" list-name="entries" default-entity-name="AcctgTransEntry"> + <form name="ListAcctgTransEntries" type="list" list-name="entries" default-entity-name="AcctgTransEntry" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="acctgTransId"> <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/> </field> @@ -160,13 +162,15 @@ <field name="isSummary"><display/></field> </form> - <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"> + <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal" + header-row-style="header-row" default-table-style="basic-table"> <field name="" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink also-hidden="false" description="[Back to Admin]" target="AdminMain?organizationPartyId=${organizationPartyId}"/> </field> </form> - <form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation"> + <form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="glReconciliationId"> <hyperlink also-hidden="false" description="${glReconciliationId}" target="viewGlReconciliation?glReconciliationId=${glReconciliationId}&amp;organizationPartyId=${organizationPartyId}&amp;glAccountId=${glAccountId}"/> </field> @@ -183,7 +187,8 @@ <field name="reconciledDate"><display/></field> </form> - <form name="ListGlReconciliationEntries" type="list" list-name="glReconciliationEntries" default-entity-name="GlReconciliationEntry"> + <form name="ListGlReconciliationEntries" type="list" list-name="glReconciliationEntries" default-entity-name="GlReconciliationEntry" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="glReconciliationId"><display/></field> <field name="acctgTransId"> <hyperlink also-hidden="false" description="${acctgTransId}" @@ -192,4 +197,4 @@ <field name="acctgTransEntrySeqId"><display/></field> <field name="reconciledAmount"><display/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=616951&r1=616950&r2=616951&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Wed Jan 30 15:23:11 2008 @@ -112,13 +112,23 @@ <widgets> <platform-specific> <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> - </platform-specific> - <container> - <label style="head1">${uiLabelMap.${labelTitleProperty}}</label> - </container> + </platform-specific> </widgets> - </section> - <include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </section> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AcctgAssignGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -153,11 +163,34 @@ <platform-specific> <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> </platform-specific> - <container style="column-left-wide"> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AcctgNavigateAccts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.AcctgNavigateAccts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - <!-- include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/ --> </decorator-section> </decorator-screen> </widgets> @@ -178,10 +211,34 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="column-left-wide"> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewGlAccountEntries}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewGlAccountEntries}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -201,13 +258,37 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="column-left-wide"> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> - </container> <platform-specific> <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html> </platform-specific> - <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewAccountingTransaction}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewAccountingTransaction}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -226,7 +307,20 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddGlAccount}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> + </container> <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / --> @@ -253,16 +347,26 @@ <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> + <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl"/></html> </platform-specific> - <container> - <label style="head1">${uiLabelMap.${labelTitleProperty}}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.${labelTitleProperty}}"/> </container> - <container style="button-bar"> - <link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/> - <link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/> + </container> + <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -334,5 +438,4 @@ </widgets> </section> </screen> -</screens> - +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=616951&r1=616950&r2=616951&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Jan 30 15:23:11 2008 @@ -515,7 +515,7 @@ <menu-item name="GlAccountNrPaymentMethod" title="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}"> <link target="GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}"/> </menu-item> - <menu-item name="VarianceReasonGlAccounts" title="${uiLabelMap.VarianceReasonGlAccounts}"> + <menu-item name="VarianceReasonGlAccounts" title="${uiLabelMap.AccountingVarianceReasonGlAccounts}"> <link target="editVarianceReasonGlAccounts?organizationPartyId=${organizationPartyId}"/> </menu-item> <menu-item name="CreditCardTypeGlAccount" title="${uiLabelMap.AccountingCreditCardTypeGlAccount}"> @@ -538,7 +538,8 @@ </menu-item> </menu> - <menu name="GlobalGLSettingMenus" selected-menuitem-context-field-name="tabButtonItem" default-menu-item-name="chartofaccounts" default-selected-style="tabButtonSelected"> + <menu name="GlobalGLSettingMenus" selected-menuitem-context-field-name="tabButtonItem" default-menu-item-name="chartofaccounts" + menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="Chartofaccounts" title="${uiLabelMap.AccountingChartOfAcctsMenu}"> <link target="FindGlobalGlAccount"/> </menu-item> @@ -552,5 +553,4 @@ <link target="editInvoiceItemType"/> </menu-item> </menu> -</menus> - +</menus> \ No newline at end of file Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=616951&r1=616950&r2=616951&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Wed Jan 30 15:23:11 2008 @@ -308,6 +308,7 @@ ProductAddCatalogProdCat=Aggiungi una Categoria a questo Catalogo (seleziona Categoria e Tipo, e inserisci Da Data opzionale) ProductAddCatalogProductCategory=Aggiungi un Catalogo a questa Categoria (seleziona Catalogo e Tipo, allora inserisci Da Data opzionale) ProductAddCategoryChild=Aggiungi Categoria Figlio +ProductAddCategoryGlAccount=Aggiungi Conto Gl ProductAddCategoryFather=Aggiungi Categoria Padre ProductAddContentCategory=Aggiungi Contenuto alla Categoria ProductAddContentProduct=Aggiungi Contenuto al Prodotto |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |