Revision 889851

Jump to revision:
Author:	doogie
Date:	Fri Dec 11 23:11:39 2009 UTC (14 years, 4 months ago)
Changed paths:	529 (showing only 100; show all)
Log Message:	Merged with trunk 889845.

Changed paths

Path	Details
ofbiz/branches/addbirt/	modified , props changed
ofbiz/branches/addbirt/.classpath	modified , text changed
ofbiz/branches/addbirt/.gitignore	modified , text changed
ofbiz/branches/addbirt/LICENSE	modified , text changed
ofbiz/branches/addbirt/README	modified , text changed
ofbiz/branches/addbirt/applications/accounting/config/AccountingEntityLabels.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/config/AccountingUiLabels.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/AccountingHelpData.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/AccountingPortletData.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/DemoPaymentsInvoices.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml (Copied from ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml, r889845)	added
ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/entitydef/entitymodel.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/servicedef/services_payment.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java	modified , text changed
ofbiz/branches/addbirt/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java	modified , text changed
ofbiz/branches/addbirt/applications/accounting/testdef/invoicetests.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/testdef/paymenttests.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (Copied from ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy, r889845)	added
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy (Copied from ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy, r889845)	added
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeBalanceSheet.groovy (Copied from ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeBalanceSheet.groovy, r889845)	added
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy (Copied from ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy, r889845)	added
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy (Copied from ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy, r889845)	added
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy	deleted
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/images/costCenters.js	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/ledger/CostCenters.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/ap/WEB-INF/controller.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/webapp/ar/WEB-INF/controller.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/FieldLookupForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/FinAccountForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/FinAccountScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/GlSetupForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/InvoiceForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/InvoiceScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/PaymentGatewayConfigForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/ReportFinancialSummaryForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/ReportFinancialSummaryScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/TransactionForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/ap/ApScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/ap/forms/InvoiceForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/accounting/widget/ar/ArPaymentScreens.xml	modified , text changed
ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizTechnical.xml	modified , text changed
ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizUser.xml	modified , text changed
ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyEvents.java (Copied from ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyEvents.java, r889845)	added
ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java	modified , text changed
ofbiz/branches/addbirt/applications/content/template/HelpTemplate.ftl	modified , text changed
ofbiz/branches/addbirt/applications/content/webapp/content/survey/SurveyForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/content/widget/content/ContentForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/content/widget/content/DataResourceForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml	modified , text changed , props changed
ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplLeaveForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplPositionForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentAppForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentForms.xml	modified , text changed
ofbiz/branches/addbirt/applications/humanres/widget/forms/GlobalHRSettingForms.xml	modified , text changed
[...]