svn commit: r598010 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: jacopoc
Date: Sun Nov 25 09:00:54 2007 New Revision: 598010 URL: http://svn.apache.org/viewvc?rev=598010&view=rev Log: Renamed AdminScreens.xml to GlSetupScreens.xml and AdminForms.xml to GlSetupForms.xml to better describe their content. Added: ofbiz/trunk/applications/accounting/widget/AdminForms.xml - copied unchanged from r597976, ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (with props) ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml - copied, changed from r597976, ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Removed: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/AccountingPrintForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=598010&r1=598009&r2=598010&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sun Nov 25 09:00:54 2007 @@ -1565,17 +1565,17 @@ <view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/> <!-- administrative pages --> - <view-map name="ListCompanies" type="screen" page="component://accounting/widget/AdminScreens.xml#ListCompanies"/> - <view-map name="TimePeriods" type="screen" page="component://accounting/widget/AdminScreens.xml#TimePeriods"/> - <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/AdminScreens.xml#PartyAcctgPreference"/> - <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/AdminScreens.xml#ListGlAccountOrganization"/> - <view-map name="SetupGlJournals" type="screen" page="component://accounting/widget/AdminScreens.xml#SetupGlJournals"/> - <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/AdminScreens.xml#ViewFXConversions"/> - <view-map name="GlAccountTypeDefaults" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypeDefaults"/> - <view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountPurInvoice"/> - <view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountSalInvoice"/> - <view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypePaymentType"/> - <view-map name="GlAccountNrPaymentMethod" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountNrPaymentMethod"/> + <view-map name="ListCompanies" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListCompanies"/> + <view-map name="TimePeriods" type="screen" page="component://accounting/widget/GlSetupScreens.xml#TimePeriods"/> + <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/GlSetupScreens.xml#PartyAcctgPreference"/> + <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListGlAccountOrganization"/> + <view-map name="SetupGlJournals" type="screen" page="component://accounting/widget/GlSetupScreens.xml#SetupGlJournals"/> + <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ViewFXConversions"/> + <view-map name="GlAccountTypeDefaults" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountTypeDefaults"/> + <view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountPurInvoice"/> + <view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountSalInvoice"/> + <view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountTypePaymentType"/> + <view-map name="GlAccountNrPaymentMethod" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountNrPaymentMethod"/> <!-- Manual Credit Card Transaction --> <view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/> Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintForms.xml?rev=598010&r1=598009&r2=598010&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingPrintForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingPrintForms.xml Sun Nov 25 09:00:54 2007 @@ -73,7 +73,6 @@ <section> <actions> <set field="title" value="Check"/> - <!-- script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh"/ --> </actions> <widgets> <platform-specific> Added: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=598010&view=auto ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (added) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Nov 25 09:00:54 2007 @@ -0,0 +1,488 @@ +<?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 +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties"> + <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field> + <field name="setup" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingSetup}"/></field> + <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounting}"/></field> + </form> + + <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list"> + <actions> + <entity-condition entity-name="GlAccountOrganizationAndClass"> + <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/> + <order-by field-name="glAccountId"/> + </entity-condition> + </actions> + <auto-fields-entity entity-name="GlAccount" default-field-type="display"/> + <field name="glAccountId" widget-style="buttontext"> + <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/> + </field> + <field name="glAccountClassId"> + <display-entity entity-name="GlAccountClass"/> + </field> + <field name="glAccountTypeId"> + <display-entity entity-name="GlAccountType"/> + </field> + </form> + + <form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account"> + <field name="organizationPartyId"><hidden/></field> + <field name="glAccountId"> + <drop-down> + <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId}]"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}"><submit button-type="button"/></field> + </form> + + <form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-service-name="createPartyAcctgPreference" default-map-name="partyAcctgPreference"> + <alt-target use-when="partyAcctgPreference!=null" target="updatePartyAcctgPreference"/> + <auto-fields-service service-name="createPartyAcctgPreference"/> + <field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field> + <!-- the partyId is always displayed --> + <field name="partyId" title="${uiLabelMap.AccountingOrganizationPartyId}"><display/></field> + <!-- if there is no partyAcctgPreference yet, then we show drop-downs for the fields and a submit button --> + <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null"> + <drop-down> + <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/> + <option key="2" description="${uiLabelMap.AccountingFiscalMonth02}"/> + <option key="3" description="${uiLabelMap.AccountingFiscalMonth03}"/> + <option key="4" description="${uiLabelMap.AccountingFiscalMonth04}"/> + <option key="5" description="${uiLabelMap.AccountingFiscalMonth05}"/> + <option key="6" description="${uiLabelMap.AccountingFiscalMonth06}"/> + <option key="7" description="${uiLabelMap.AccountingFiscalMonth07}"/> + <option key="8" description="${uiLabelMap.AccountingFiscalMonth08}"/> + <option key="9" description="${uiLabelMap.AccountingFiscalMonth09}"/> + <option key="10" description="${uiLabelMap.AccountingFiscalMonth10}"/> + <option key="11" description="${uiLabelMap.AccountingFiscalMonth11}"/> + <option key="12" description="${uiLabelMap.AccountingFiscalMonth12}"/> + </drop-down> + </field> + <field name="fiscalYearStartDay" use-when="partyAcctgPreference==null"> + <drop-down> + <option key="1"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> + <option key="6"/><option key="7"/><option key="8"/><option key="9"/><option key="10"/> + <option key="11"/><option key="12"/><option key="13"/><option key="14"/><option key="15"/> + <option key="16"/><option key="17"/><option key="18"/><option key="19"/><option key="20"/> + <option key="21"/><option key="22"/><option key="23"/><option key="24"/><option key="25"/> + <option key="26"/><option key="27"/><option key="28"/><option key="29"/><option key="30"/> + <option key="31"/> + </drop-down> + </field> + + <field name="taxFormId" use-when="partyAcctgPreference==null"> + <drop-down> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="TAX_FORMS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="cogsMethodId" use-when="partyAcctgPreference==null"> + <drop-down> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="baseCurrencyUomId" use-when="partyAcctgPreference==null"> + <drop-down no-current-selected-key="${defaultCurrencyUomId}"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="invoiceIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field> + <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference==null"> + <drop-down> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null"> + <drop-down allow-empty="true"> + <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> + </drop-down> + </field> + + <field name="quoteIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field> + <field name="quoteSequenceEnumId" use-when="partyAcctgPreference==null"> + <drop-down> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="orderIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field> + <field name="orderSequenceEnumId" use-when="partyAcctgPreference==null"> + <drop-down> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="createButton" use-when="partyAcctgPreference==null" title="${uiLabelMap.CommonAdd}"><submit/></field> + <field name="updateButton" use-when="partyAcctgPreference!=null" title="${uiLabelMap.CommonUpdate}"><submit/></field> + + <!-- otherwise, we just display the fields. there is no submit button because we shouldn't try to create it again and don't support an update option right now--> + <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null"><display/></field> + <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null"><display/></field> + <field name="taxFormId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> + <field name="cogsMethodId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> + <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null"><display/></field> + <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null"><display/></field> + <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> + <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null"><display/></field> + + <field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> + <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null"><display/></field> + <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null"><display/></field> + <field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> + <field name="orderIdPrefix" use-when="partyAcctgPreference!=null"><display/></field> + <field name="lastOrderNumber" use-when="partyAcctgPreference!=null"><display/></field> + <!-- + <field name="quoteSequenceEnumId" type="id-ne"/> + <field name="quoteIdPrefix" type="very-short"/> + <field name="lastQuoteNumber" type="numeric"/> + <field name="orderSequenceEnumId" type="id-ne"/> + <field name="orderIdPrefix" type="very-short"/> + <field name="lastOrderNumber" type="numeric"/> +--> + <!-- these 2 are ONLY displayed, never allow manual editing --> + <field name="lastInvoiceNumber"><display/></field> + <field name="lastInvoiceRestartDate"><display/></field> + + <field name="refundPaymentMethodId"> + <drop-down> + <entity-options entity-name="PaymentMethod" description="${description}" key-field-name="paymentMethodId"> + <entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/> + </entity-options> + </drop-down> + </field> + <field name="errorGlJournalId"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlJournal" key-field-name="glJournalId" description="${glJournalName} [${glJournalId}]"> + <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <entity-order-by field-name="glJournalName"/> + </entity-options> + </drop-down> + </field> + </form> + + <!-- forms for managing FX rates --> + <form name="ListConversions" type="list" list-name="conversions"> + <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}"><display/></field> + <field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}"><display/></field> + <field name="conversionFactor"><display/></field> + <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field> + <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> + </form> + + <form name="updateFXConversion" type="single" target="updateFXConversion" default-service-name="updateFXConversion"> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}"> + <drop-down no-current-selected-key="${defaultCurrencyUomId}"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}"> + <drop-down no-current-selected-key="${defaultCurrencyUomId}"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="conversionFactor"><text/></field> + <field name="submitButton" title="${uiLabelMap.AccountingUpdateFX}"><submit/></field> + </form> + + <form name="ListGlAccountTypeDefaults" type="list" target="" list-name="glAccountTypeDefaults"> + <actions> + <entity-condition entity-name="GlAccountTypeDefault" list-name="glAccountTypeDefaults"> + <condition-list> + <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + </condition-list> + <order-by field-name="glAccountTypeId"/> + </entity-condition> + </actions> + <field name="glAccountTypeId"> + <display-entity entity-name="GlAccountType"/> + </field> + <field name="glAccountId"> + <display-entity entity-name="GlAccount" description="[${glAccountId}] ${accountCode} ${accountName}"/> + </field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeGlAccountTypeDefault?glAccountTypeId=${glAccountTypeId}&glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}"/> + </field> + </form> + <form name="EditGlAccountTypeDefault" type="single" title="" target="createGlAccountTypeDefault"> + <auto-fields-service service-name="createGlAccountTypeDefault"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="glAccountTypeId"> + <drop-down> + <entity-options entity-name="GlAccountType" description="${description}"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="glAccountId"> + <drop-down> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]"> + <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + + <!-- forms for Sales invoice Itemtypes to GLAccount number --> + <form name="ListSalInvoiceItemTypeGlAssignments" type="list" list-name="invoiceItemTypes"> + <actions> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh"/> + </actions> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="invoiceItemTypeId"><hidden/></field> + <field name="description"><display/></field> + <field name="defaultGlAccountId"><display/></field> + <field name="overrideGlAccountId"><display/></field> + <field name="activeGlDescription"><display/></field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="removeSalInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field> + </form> + <form name="AddSalInvoiceItemTypeGlAssignment" type="single" target="addSalInvoiceItemTypeGlAssignment"> + <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="invoiceItemTypeId"> + <drop-down allow-empty="false" > + <entity-options description="${description}" entity-name="InvoiceItemType"> + <entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="glAccountId" title="${uiLabelMap.AccountingOverrideRevenueGlAccountId}"> + <drop-down> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]"> + <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <entity-constraint name="glAccountClassId" operator="equals" value="REVENUE"></entity-constraint> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + + <!-- forms for Purchase invoice Itemtypes to GLAccount number --> + <form name="ListPurInvoiceItemTypeGlAssignments" type="list" list-name="purinvoiceItemTypes" default-map-name="iTypes"> + <actions> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh"/> + </actions> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="invoiceItemTypeId"><hidden/></field> + <field name="description"><display/></field> + <field name="defaultGlAccountId"><display/></field> + <field name="glAccountId" title="Override GL Account Id"><display/></field> + <field name="activeGlDescription"><display/></field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="removePurInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field> + </form> + <form name="AddPurInvoiceItemTypeGlAssignment" type="single" target="addPurInvoiceItemTypeGlAssignment"> + <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="invoiceItemTypeId" title="Purchase invoice Item Type"> + <drop-down allow-empty="false" > + <entity-options description="${description}" entity-name="InvoiceItemType"> + <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV_%"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="glAccountId" title="Override Expense Gl Account Id"> + <drop-down> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]"> + <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <entity-constraint name="glAccountClassId" operator="equals" value="EXPENSE"></entity-constraint> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + + <!-- forms for payment types to GLAccount type --> + <form name="ListPaymentTypeGlAssignments" type="list"> + <actions> + <entity-condition entity-name="PaymentGlAccountTypeMap"> + <condition-expr field-name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <order-by field-name="paymentTypeId"/> + </entity-condition> + </actions> + <auto-fields-entity entity-name="PaymentGlAccountTypeMap" default-field-type="display"/> + <field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field> + <field name="glAccountTypeId"><display-entity entity-name="GlAccountType" description="${description}"/></field> + <field name="organizationPartyId"><hidden/></field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="removePaymentTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentTypeId=${paymentTypeId}" description="Remove"/></field> + </form> + + <form name="AddPaymentTypeGlAssignment" type="single" target="addPaymentTypeGlAssignment"> + <auto-fields-service service-name="addPaymentTypeGlAssignment"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="paymentTypeId" title="Payment type"> + <drop-down> + <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="glAccountTypeId" title="Gl Account type"> + <drop-down> + <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + <!-- forms for payment method Type to GLAccounts --> + <form name="ListPaymentMethodTypeGlAssignments" type="list"> + <actions> + <entity-condition entity-name="PaymentMethodTypeGlAccount"> + <condition-expr field-name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <order-by field-name="paymentMethodTypeId"/> + </entity-condition> + </actions> + <auto-fields-entity entity-name="PaymentMethodTypeGlAccount" default-field-type="display"/> + <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field> + <field name="glAccountId"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]"/></field> + <field name="organizationPartyId"><hidden/></field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="removePaymentMethodTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentMethodTypeId=${paymentMethodTypeId}" description="Remove"/></field> + </form> + + <form name="AddPaymentMethodTypeGlAssignment" type="single" target="addPaymentMethodTypeGlAssignment"> + <auto-fields-service service-name="addPaymentMethodTypeGlAssignment"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="paymentMethodTypeId" title="Payment method type"> + <drop-down> + <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="glAccountId" title="Gl Account Id"> + <drop-down> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]"> + <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + + <!-- Accounting Time Period forms--> + <form name="ListClosedTimePeriods" type="list" list-name="closedTimePeriods"> + <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="display"/> + <field name="organizationPartyId"><hidden/></field> + <field name="isClosed"><hidden/></field> + <field name="periodTypeId"> + <display-entity entity-name="PeriodType"/> + </field> + <field name="parentPeriodId"> + <display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/> + </field> + </form> + <form name="ListOpenTimePeriods" type="list" list-name="openTimePeriods"> + <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="display"/> + <field name="organizationPartyId"><hidden/></field> + <field name="isClosed"><hidden/></field> + <field name="periodTypeId"> + <display-entity entity-name="PeriodType"/> + </field> + <field name="parentPeriodId"> + <display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/> + </field> + </form> + <form name="CreateTimePeriod" type="single" title="" target="createCustomTimePeriod"> + <auto-fields-service service-name="createCustomTimePeriod"/> + <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> + <field name="isClosed"> + <drop-down> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> + </drop-down> + </field> + <field name="parentPeriodId"> + <drop-down allow-empty="true"> + <list-options list-name="openTimePeriods" key-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/> + </drop-down> + </field> + <field name="periodTypeId"> + <drop-down> + <entity-options entity-name="PeriodType" description="${description}"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit/></field> + </form> + + <form name="EditGlJournal" type="single" target="createGlJournal" title="" default-map-name="glJournal"> + <alt-target use-when="glJournal!=null" target="updateGlJournal"/> + <auto-fields-service service-name="createGlJournal"/> + <field name="organizationPartyId"><hidden/></field> + <field name="glJournalId" use-when="glJournal!=null"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> + </form> + <form name="ListGlJournals" type="list"> + <actions> + <entity-condition entity-name="GlJournal"> + <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <order-by field-name="glJournalId"/> + </entity-condition> + </actions> + <auto-fields-entity entity-name="GlJournal" default-field-type="display"/> + <field name="organizationPartyId"><hidden/></field> + <field name="glJournalId" widget-style="buttontext"> + <hyperlink target="SetupGlJournals?organizationPartyId=${organizationPartyId}&glJournalId=${glJournalId}" description="${glJournalId}"/> + </field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink target="deleteGlJournal?organizationPartyId=${organizationPartyId}&glJournalId=${glJournalId}" description="${uiLabelMap.CommonRemove}"/> + </field> + </form> +</forms> Propchange: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (from r597976, ofbiz/trunk/applications/accounting/widget/AdminScreens.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?p2=ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml&p1=ofbiz/trunk/applications/accounting/widget/AdminScreens.xml&r1=597976&r2=598010&rev=598010&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Sun Nov 25 09:00:54 2007 @@ -35,7 +35,7 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListCompanies" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -55,8 +55,8 @@ <widgets> <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> - <include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListGlAccountOrganization" location="component://accounting/widget/GlSetupForms.xml"/> + <include-form name="AssignGlAccount" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -92,11 +92,11 @@ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <label style="head1">${uiLabelMap.AccountingOpenTimePeriods}</label> - <include-form name="ListOpenTimePeriods" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListOpenTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> <label style="head1">${uiLabelMap.AccountingClosedTimePeriods}</label> - <include-form name="ListClosedTimePeriods" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListClosedTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> <label style="head1">${uiLabelMap.CommonNew}</label> - <include-form name="CreateTimePeriod" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="CreateTimePeriod" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -118,7 +118,7 @@ <widgets> <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="PartyAcctgPreference" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="PartyAcctgPreference" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -145,9 +145,9 @@ <widgets> <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListConversions" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/> <label style="head1">${uiLabelMap.AccountingUpdateFX}</label> - <include-form name="updateFXConversion" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -166,8 +166,8 @@ <widgets> <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListGlJournals" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> - <include-form name="EditGlJournal" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListGlJournals" location="component://accounting/widget/GlSetupForms.xml"/> + <include-form name="EditGlJournal" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -188,9 +188,9 @@ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <include-form name="ListGlAccountTypeDefaults" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <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/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="EditGlAccountTypeDefault" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -212,9 +212,9 @@ <decorator-section name="body"> <container> <container><label style="head1">${uiLabelMap.AccountingSalesInvoiceToRevenue}</label></container> - <include-form name="ListSalInvoiceItemTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <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/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="AddSalInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -236,10 +236,10 @@ <container> <container><label style="head1">Purchase Invoice type to Expense GL Account Number assignmentlist</label></container> <container> - <include-form name="ListPurInvoiceItemTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListPurInvoiceItemTypeGlAssignments" location="component://accounting/widget/GlSetupForms.xml"/> </container> <container><label style="head1">Assign Purchase Invoice Item type to Expense GL Account Number</label></container> - <include-form name="AddPurInvoiceItemTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="AddPurInvoiceItemTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -259,9 +259,9 @@ <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/webapp/accounting/admin/AdminForms.xml"/> + <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/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="AddPaymentTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> @@ -281,9 +281,9 @@ <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/webapp/accounting/admin/AdminForms.xml"/> + <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/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="AddPaymentMethodTypeGlAssignment" location="component://accounting/widget/GlSetupForms.xml"/> </container> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |