svn commit: r805519 [1/9] - in /ofbiz/branches/executionconte
Locked
svn commit: r805519 [1/9] - in /ofbiz/branches/executionconte
 
|
Author: adrianc
Date: Tue Aug 18 18:10:44 2009 New Revision: 805519 URL: http://svn.apache.org/viewvc?rev=805519&view=rev Log: Removed the entity component refactoring, synchronized with trunk. This branch will be focused on the ExecutionContext implementation and the security redesign. Added: ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoTaxAuthority.xml ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/ ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/ ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_CONTENT.xml ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT.xml ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT_NL.xml ofbiz/branches/executioncontext20090812/applications/content/dtd/docbook.xsd ofbiz/branches/executioncontext20090812/applications/content/dtd/xlink.xsd ofbiz/branches/executioncontext20090812/applications/content/dtd/xml.xsd ofbiz/branches/executioncontext20090812/applications/product/data/helpdata/ ofbiz/branches/executioncontext20090812/applications/product/data/helpdata/HELP_PRODUCT.xml ofbiz/branches/executioncontext20090812/framework/testtools/OFBizSeleniumXmlIntro.pdf (with props) ofbiz/branches/executioncontext20090812/framework/testtools/convertSeleniumIDE.bat ofbiz/branches/executioncontext20090812/framework/testtools/convertSeleniumIDE.sh ofbiz/branches/executioncontext20090812/framework/testtools/dtd/SeleniumXml.xsd ofbiz/branches/executioncontext20090812/framework/testtools/runSeleniumServer.bat ofbiz/branches/executioncontext20090812/framework/testtools/runSeleniumServer.sh ofbiz/branches/executioncontext20090812/framework/testtools/runSeleniumXml.bat ofbiz/branches/executioncontext20090812/framework/testtools/runSeleniumXml.sh Removed: ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/EntityFactory.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/EntityFactoryImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/EntityObjectFactory.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntityImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericPKImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntityImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelEntityImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelFactory.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelFactoryImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelFieldImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelKeyMapImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelObjectFactory.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelRelationImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelViewEntityImpl.java Modified: ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml ofbiz/branches/executioncontext20090812/applications/content/entitydef/entitymodel.xml ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/branches/executioncontext20090812/applications/product/data/ProductHelpData.xml ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/branches/executioncontext20090812/framework/api/src/org/ofbiz/api/context/ExecutionContextImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/DelegatorImpl.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericEntity.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericPK.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/GenericValue.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelField.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelReader.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/executioncontext20090812/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java ofbiz/branches/executioncontext20090812/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java ofbiz/branches/executioncontext20090812/framework/testtools/testdef/seleniumxml/example/example_login.xml ofbiz/branches/executioncontext20090812/framework/testtools/testdef/seleniumxml/example/example_testsuite.xml ofbiz/branches/executioncontext20090812/framework/webslinger/build.xml ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java ofbiz/branches/executioncontext20090812/revert.bat ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Modified: ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml Tue Aug 18 18:10:44 2009 @@ -4540,6 +4540,9 @@ <value xml:lang="it">Istanza del prodotto</value> <value xml:lang="zh">产åæ è¯å®ä¾</value> </property> + <property key="AccountingInvalidGlReconciliationAssignment"> + <value xml:lang="en">Invalid Gl Reconciliation Assignement: You can not assign FinAccountTrans in Approved or Cancel Status. FinAccount Transaction need to be in Created status only.</value> + </property> <property key="AccountingInventoryValuation"> <value xml:lang="en">Inventory Valuation</value> <value xml:lang="hi_IN">वसà¥à¤¤à¥ मà¥à¤²à¥à¤¯à¤¾à¤à¤à¤¨</value> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml Tue Aug 18 18:10:44 2009 @@ -18,25 +18,7 @@ under the License. --> <entity-engine-xml> - <!-- =======Help=========== --> - <DataResource dataResourceId="HELP_ACCOUNTING" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Manager Help" mimeTypeId="text/xml" isPublic="Y" /> - <ElectronicText dataResourceId="HELP_ACCOUNTING"> - <textData><![CDATA[ - <root> - <generalTitle> - The Accounting Manager. - </generalTitle> - <general> - <section> - <text> - The Accounting Manager keeps track of financial charges, credit card processes, and receipts of payment. - The link from the Order Manager to the Accounting Manager is the Invoice Number, generated when the Order is processed. - </text> - </section> - </general> - </root> - ]]></textData> - </ElectronicText> + <DataResource dataResourceId="HELP_ACCOUNTING" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_ACCOUNTING" contentTypeId="DOCUMENT" contentName="Accounting Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ACCOUNTING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ACCOUNTING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> </entity-engine-xml> Added: ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoTaxAuthority.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoTaxAuthority.xml?rev=805519&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoTaxAuthority.xml (added) +++ ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoTaxAuthority.xml Tue Aug 18 18:10:44 2009 @@ -0,0 +1,130 @@ +<?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. +--> + +<entity-engine-xml> + <Party partyId="USA_IRS" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="USA_IRS" groupName="United States of America - Internal Revenue Service"/> + <PartyRole partyId="USA_IRS" roleTypeId="TAX_AUTHORITY"/> + + <Party partyId="CA_BOE" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="CA_BOE" groupName="State of Calilfornia Board of Equalization"/> + <ContactMech contactMechId="CA_BOE_0" contactMechTypeId="POSTAL_ADDRESS"/> + <PostalAddress contactMechId="CA_BOE_0" toName="Board of Equalization" address1="P O BOX 942879" city="Sacramento" stateProvinceGeoId="CA" postalCode="94279" countryGeoId="USA"/> + <PartyContactMech partyId="CA_BOE" contactMechId="CA_BOE_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/> + <PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> + <PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> + <PartyRole partyId="CA_BOE" roleTypeId="TAX_AUTHORITY"/> + + <Party partyId="NY_DTF" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="NY_DTF" groupName="New York Department of Taxation and Finance"/> + <ContactMech contactMechId="NY_DTF_0" contactMechTypeId="POSTAL_ADDRESS"/> + <PostalAddress contactMechId="NY_DTF_0" toName="NYS Sales Tax Processing" address1="JAF Building" address2="PO BOX 1205" city="New York" stateProvinceGeoId="NY" postalCode="11016" countryGeoId="USA"/> + <PartyContactMech partyId="NY_DTF" contactMechId="NY_DTF_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/> + <PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> + <PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> + <PartyRole partyId="NY_DTF" roleTypeId="TAX_AUTHORITY"/> + + <Party partyId="TX_TAXMAN" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="TX_TAXMAN" groupName="Texas Sales Tax Authority"/> + <PartyRole partyId="TX_TAXMAN" roleTypeId="TAX_AUTHORITY"/> + + <Party partyId="UT_TAXMAN" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="UT_TAXMAN" groupName="Utah Sales Tax Authority"/> + <PartyRole partyId="UT_TAXMAN" roleTypeId="TAX_AUTHORITY"/> + <Party partyId="UT_UTAH_TAXMAN" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="UT_UTAH_TAXMAN" groupName="Utah County, Utah Sales Tax Authority"/> + <PartyRole partyId="UT_UTAH_TAXMAN" roleTypeId="TAX_AUTHORITY"/> + + <Party partyId="CAN_TAXMAN" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="CAN_TAXMAN" groupName="Canada Tax Authority"/> + <PartyRole partyId="CAN_TAXMAN" roleTypeId="TAX_AUTHORITY"/> + <Party partyId="ON_TAXMAN" partyTypeId="PARTY_GROUP"/> + <PartyGroup partyId="ON_TAXMAN" groupName="Ontario Sales Tax (VAT) Authority"/> + <PartyRole partyId="ON_TAXMAN" roleTypeId="TAX_AUTHORITY"/> + + <!-- _NA_ TaxAuthority defs --> + <ProductCategory productCategoryId="20111"/> + <TaxAuthority taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" organizationPartyId="Company" glAccountId="224000"/> + <TaxAuthorityCategory taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" productCategoryId="20111"/> <!-- Micro Widgets, a category to be used to test categorized rates --> + <!-- taxAuthorityRateSeqId left blank to be auto-sequenced during the EE XML import --> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9000" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="25.00" minPurchase="0.00" taxShipping="N" taxPercentage="1" taxPromotions="N" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="1% OFB _NA_ Tax"/> + + <!-- USA TaxAuthority defs --> + <TaxAuthority taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" taxIdFormatPattern="\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4}" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" organizationPartyId="Company" glAccountId="224106"/> + + <TaxAuthority taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" organizationPartyId="Company" glAccountId="224106"/> + <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="CA" toTaxAuthPartyId="CA_BOE" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9001" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="California State Sales Tax"/> + + <TaxAuthority taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" organizationPartyId="Company" glAccountId="224140"/> + <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="NY" toTaxAuthPartyId="NY_DTF" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9002" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.25" taxPromotions="N" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="New York State Sales Tax"/> + + <TaxAuthority taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" organizationPartyId="Company" glAccountId="224151"/> + <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="TX" toTaxAuthPartyId="TX_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9003" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="Texas State Sales Tax"/> + + <TaxAuthority taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" organizationPartyId="Company" glAccountId="224153"/> + <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="UT" toTaxAuthPartyId="UT_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9004" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.75" taxPromotions="N" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah State Sales Tax"/> + <!-- An example county; there is some zip code data for testing this; note this is ONLY test data, there isn't really extra sales tax for this county --> + <TaxAuthority taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" includeTaxInPrice="N"/> + <!-- NOTE: using the state's sales tax GL Account --> + <TaxAuthorityGlAccount taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" organizationPartyId="Company" glAccountId="224153"/> + <TaxAuthorityAssoc taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" toTaxAuthGeoId="UT-UTAH" toTaxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9005" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" + productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="0.1" + fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah County, Utah Sales Tax"/> + + <!-- Canada TaxAuthority defs --> + <TaxAuthority taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" includeTaxInPrice="N"/> + <TaxAuthorityGlAccount taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" organizationPartyId="Company" glAccountId="224209"/> + <TaxAuthority taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" includeTaxInPrice="Y"/> + <TaxAuthorityGlAccount taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" organizationPartyId="Company" glAccountId="224209"/> + + <!-- Party TaxAuthority info for Company --> + <!-- some interesting information at: http://www.taxadmin.org/fta/rate/tax_stru.html --> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="12-3456789" isExempt="Y" isNexus="N"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="N"/> <!-- this one is not a nexus to test that feature --> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="87654321" isExempt="N" isNexus="Y"/> + <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> + +</entity-engine-xml> Added: ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml?rev=805519&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml (added) +++ ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml Tue Aug 18 18:10:44 2009 @@ -0,0 +1,30 @@ +<?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. +--> +<root> + <generalTitle> + The Content Manager. + </generalTitle> + <general> + <section> + <text>The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</text> + </section> + </general> +</root> + Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Aug 18 18:10:44 2009 @@ -906,7 +906,13 @@ <simple-method method-name="assignGlRecToFinAccTrans" short-description="Assignment of Gl Reconciliation to Fin Account Trans"> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> - <set field="finAccountTrans.glReconciliationId" from-field="parameters.glReconciliationId"/> - <store-value value-field="finAccountTrans"/> + <if-compare field="finAccountTrans.statusId" operator="not-equals" value="FINACT_TRNS_CREATED"> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/></add-error> + <check-errors/> + <else> + <set field="finAccountTrans.glReconciliationId" from-field="parameters.glReconciliationId"/> + <store-value value-field="finAccountTrans"/> + </else> + </if-compare> </simple-method> </simple-methods> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml Tue Aug 18 18:10:44 2009 @@ -467,6 +467,7 @@ <attribute name="finAccountId" type="String" mode="IN" optional="false"/> <attribute name="groupInOneTransaction" type="String" mode="IN" optional="true"/> <attribute name="paymentGroupTypeId" type="String" mode="IN" optional="true"/> + <attribute name="paymentGroupName" type="String" mode="IN" optional="true"/> <attribute name="finAccountTransId" type="String" mode="OUT" optional="true"/> </service> <service name="expirePaymentAssociationsOnFinAccountTransCancel" engine="simple" location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="expirePaymentAssociationsOnFinAccountTransCancel"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Tue Aug 18 18:10:44 2009 @@ -43,7 +43,6 @@ import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.EntityFactory; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; @@ -1526,7 +1525,7 @@ try { // Select all the unapplied payment applications associated to the billing account List<EntityExpr> conditionList = UtilMisc.toList(EntityCondition.makeCondition("billingAccountId", EntityOperator.EQUALS, billingAccountId), - EntityCondition.makeCondition("invoiceId", EntityOperator.EQUALS, EntityFactory.NULL_FIELD)); + EntityCondition.makeCondition("invoiceId", EntityOperator.EQUALS, GenericEntity.NULL_FIELD)); EntityCondition conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); List<GenericValue> paymentApplications = delegator.findList("PaymentApplication", conditions, null, UtilMisc.toList("-amountApplied"), null, false); Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Tue Aug 18 18:10:44 2009 @@ -122,7 +122,9 @@ </tr> </#list> <div align="right"> - ${uiLabelMap.AccountingGroupInOneTransaction} + <span class="label">${uiLabelMap.AccountingPayment} ${uiLabelMap.PartyPartyGroupName}</span> + <input type="text" size='25' id="paymentGroupName" name='paymentGroupName'> + <span class="label">${uiLabelMap.AccountingGroupInOneTransaction}</span> <input type="checkbox" name="groupInOneTransaction" value="Y" checked/> <input id="submitButton" type="button" onclick="javascript:document.depositWithdrawPaymentsForm.submit();" value="${uiLabelMap.AccountingDepositWithdraw}" disabled/> </div> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml Tue Aug 18 18:10:44 2009 @@ -194,7 +194,7 @@ <field name="paymentId"><lookup target-form-name="LookupPayment"/></field> <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <drop-down allow-empty="true"> + <drop-down> <entity-options entity-name="StatusItem" description="${description}"> <entity-constraint name="statusTypeId" value="FINACT_TRNS_STATUS"/> </entity-options> Modified: ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml Tue Aug 18 18:10:44 2009 @@ -18,48 +18,19 @@ under the License. --> <entity-engine-xml> + <!-- system document root used in content -> navigate --> <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/> + <!-- show help on the system document root --> <ContentAssoc contentId="TREE_ROOT" contentIdTo="HELP_ROOT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/> - <!-- =======General Help=========== --> - <DataResource dataResourceId="HELP_ROOT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> - <ElectronicText dataResourceId="HELP_ROOT"> - <textData><![CDATA[ - <root> - <generalTitle> - Welcome to the Apache OFBiz help system - </generalTitle> - <general> - <section> - <text>If you arrived at this page without selecting the index, then a specific help page was not yet available</text> - </section> - <section> - <text>This system will provide you context sensitive help throughout the system.</text> - </section> - <section> - <text>For more info on the help system itself check the </text> - </section> - </general> - </root> - ]]></textData> - </ElectronicText> - <Content contentId="HELP_ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/> - + <DataResource dataResourceId="HELP_ROOT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="HELP_ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/> + <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> + <!-- how to create alternative locales --> + <Content contentId="HELP_ROOT_NL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_NL" localeString="nl" statusId="CTNT_IN_PROGRESS" contentName="Help system root in dutch" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> + <!-- Content specific --> - <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager Help" mimeTypeId="text/xml" isPublic="Y" /> - <ElectronicText dataResourceId="HELP_CONTENT"> - <textData><![CDATA[ - <root> - <generalTitle> - The Content Manager. - </generalTitle> - <general> - <section> - <text>The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</text> - </section> - </general> - </root> - ]]></textData> - </ElectronicText> + <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_CONTENT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="050"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml?rev=805519&r1=805518&r2=805519&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml Tue Aug 18 18:10:44 2009 @@ -468,7 +468,32 @@ <DataResource dataResourceId="HELP_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> <ElectronicText dataResourceId="HELP_TEMPL"> <textData><![CDATA[ -<#if layoutSettings.VT_NAME[0] == "FLAT_GREY"> +<#if layoutSettings.VT_NAME[0] == "FLAT_GREY"> +<#--import applications/content/template/documentLib.ftl as doc/--> +<#macro link text url> + <a href="${url}">${text}</a> +</#macro> + +<#macro text section> + <#list section.* as t> + <#if t?node_name == "text"> + ${t} + <#elseif t?node_name == "link"> + <a href="${t.@url}">${t}</a> + <#elseif t?node_name == "b"> + <b>${t}</b> + <#elseif t?node_name == "ol"> + <ol> + <#list t.* as i> + <li class=h2>${i}</li> + </#list> + </ol><br/> + </#if> + </#list> + <br/> +</#macro> + + <div class="contentarea"> <div id="column-container"> <div id="content-main-section"> @@ -490,7 +515,7 @@ <#if doc.root.general?has_content> <h1>${doc.root.generalTitle?if_exists}</h1> <#list doc.root.general.section as section> - <p class=h2>${section.text}</p> + <p class=h2><@text section/></p> </#list> </#if> Added: ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_CONTENT.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_CONTENT.xml?rev=805519&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_CONTENT.xml (added) +++ ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_CONTENT.xml Tue Aug 18 18:10:44 2009 @@ -0,0 +1,29 @@ +<?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. +--> +<root> + <generalTitle> + The Content Manager. + </generalTitle> + <general> + <section> + <text>The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</text> + </section> + </general> +</root> Added: ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT.xml?rev=805519&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT.xml (added) +++ ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT.xml Tue Aug 18 18:10:44 2009 @@ -0,0 +1,33 @@ +<?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. +--> +<root> + <generalTitle> + Welcome to the Apache OFBiz help system + </generalTitle> + <general> + <section> + <text>If you arrived at this page </text><b>without</b><text> selecting the index, then a specific help page was </text><b>not</b><text> yet available</text> + </section> + <section> + <text>This system will provide you context sensitive help throughout the system.</text> + </section> + </general> +</root> + Added: ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT_NL.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT_NL.xml?rev=805519&view=auto ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT_NL.xml (added) +++ ofbiz/branches/executioncontext20090812/applications/content/data/helpdata/HELP_ROOT_NL.xml Tue Aug 18 18:10:44 2009 @@ -0,0 +1,33 @@ +<?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. +--> +<root> + <generalTitle> + Welkom in het Apache OFBiz help systeem. + </generalTitle> + <general> + <section> + <text>Als je op deze pagina beland zonder de index geselecteerd te hebben,wordt veroorzaakt doordat de specifieke help pagina nog niet beschikbaar is.</text> + </section> + <section> + <text>Dit help systeem geeft je scherm afhankelijke informatie.</text> + </section> + </general> +</root> + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |