svn commit: r960512 [1/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r960512 [1/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Author: jleroux
Date: Mon Jul 5 10:07:56 2010 New Revision: 960512 URL: http://svn.apache.org/viewvc?rev=960512&view=rev Log: Merge the trunk at r960491 Added: ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties - copied unchanged from r960493, ofbiz/trunk/applications/product/config/freemarkerTransforms.properties ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java - copied unchanged from r960493, ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java ofbiz/branches/jquery/framework/base/lib/scripting/groovy-all-1.7.3.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.3.jar ofbiz/branches/jquery/framework/base/lib/ws-commons-java5-1.0.1.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/ws-commons-java5-1.0.1.jar ofbiz/branches/jquery/framework/base/lib/ws-commons-util-1.0.2.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/ws-commons-util-1.0.2.jar ofbiz/branches/jquery/framework/base/lib/xmlrpc-client-3.1.2.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar ofbiz/branches/jquery/framework/base/lib/xmlrpc-common-3.1.2.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar ofbiz/branches/jquery/framework/base/lib/xmlrpc-server-3.1.2.jar - copied unchanged from r960493, ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java - copied unchanged from r960493, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/en.js - copied unchanged from r960493, ofbiz/trunk/framework/images/webapp/images/calendarDateSelect/locale/en.js ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java - copied unchanged from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/test/AbstractXmlRpcTestCase.java - copied unchanged from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/test/AbstractXmlRpcTestCase.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java - copied unchanged from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/xmlrpc/ - copied from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/xmlrpc/ ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java - copied unchanged from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/xmlrpc/XmlRpcClient.java - copied unchanged from r960493, ofbiz/trunk/framework/service/src/org/ofbiz/service/xmlrpc/XmlRpcClient.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java - copied unchanged from r960493, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Removed: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl ofbiz/branches/jquery/framework/base/lib/scripting/groovy-1.7-rc-2.jar ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypecloudscape.xml ofbiz/branches/jquery/framework/webapp/lib/ws-commons-java5-1.0.1.jar ofbiz/branches/jquery/framework/webapp/lib/ws-commons-util-1.0.1.jar ofbiz/branches/jquery/framework/webapp/lib/xmlrpc-client-3.0.jar ofbiz/branches/jquery/framework/webapp/lib/xmlrpc-common-3.0.jar ofbiz/branches/jquery/framework/webapp/lib/xmlrpc-server-3.0.jar ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/xmlrpc/ Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/.classpath ofbiz/branches/jquery/LICENSE ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/web.xml ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/web.xml ofbiz/branches/jquery/applications/accounting/webapp/ar/WEB-INF/web.xml ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/web.xml ofbiz/branches/jquery/applications/humanres/webapp/humanres/WEB-INF/web.xml ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/web.xml ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/web.xml ofbiz/branches/jquery/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/jquery/applications/order/entitydef/entitymodel_view.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/branches/jquery/applications/order/servicedef/services.xml ofbiz/branches/jquery/applications/order/servicedef/services_quote.xml ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/web.xml ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml ofbiz/branches/jquery/applications/party/data/PartyPortletData.xml ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/web.xml ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/branches/jquery/applications/product/servicedef/services_view.xml ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/web.xml ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/web.xml ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/jquery/applications/workeffort/webapp/ical/WEB-INF/web.xml ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/web.xml ofbiz/branches/jquery/common.xml ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilProperties.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java ofbiz/branches/jquery/framework/bi/webapp/bi/WEB-INF/web.xml ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/data/CommonTypeData.xml ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml ofbiz/branches/jquery/framework/common/servicedef/services.xml ofbiz/branches/jquery/framework/common/servicedef/services_email.xml ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/branches/jquery/framework/common/webcommon/includes/flotrCharts/Pie.ftl ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jquery/framework/common/webcommon/includes/messages.ftl ofbiz/branches/jquery/framework/entity/config/entityengine.xml ofbiz/branches/jquery/framework/entity/dtd/fieldtypemodel.xsd ofbiz/branches/jquery/framework/entity/entitydef/entitymodel_test.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeadvantage.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeaxion.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypedaffodil.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypederby.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypefirebird.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypehsql.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemssql.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypemysql.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeoracle.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostgres.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypepostnew.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesapdb.xml ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypesybase.xml ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/EntityLockedException.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/web.xml ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/web.xml ofbiz/branches/jquery/framework/exampleext/webapp/exampleext/WEB-INF/web.xml ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/de.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/es.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/fi.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/fr.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/nl.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/pl.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/pt.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/ru.js ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/zh.js ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js ofbiz/branches/jquery/framework/images/webapp/images/selectall.js ofbiz/branches/jquery/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java ofbiz/branches/jquery/framework/resources/templates/web.xml ofbiz/branches/jquery/framework/service/config/serviceengine.xml ofbiz/branches/jquery/framework/service/dtd/service-config.xsd ofbiz/branches/jquery/framework/service/servicedef/services_test_se.xml ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/GenericDispatcher.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java ofbiz/branches/jquery/framework/service/testdef/servicetests.xml ofbiz/branches/jquery/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/web.xml ofbiz/branches/jquery/framework/webapp/config/url.properties ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/jquery/framework/webapp/testdef/webapptests.xml ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/web.xml ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ListGeneric.ftl ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd ofbiz/branches/jquery/framework/widget/dtd/widget-screen.xsd ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/jquery/framework/widget/templates/foScreenMacroLibrary.ftl ofbiz/branches/jquery/macros.xml ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/cmssite/template/cms/HtmlHead.ftl ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/branches/jquery/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml ofbiz/branches/jquery/specialpurpose/ebaystore/data/EbayStorePortletData.xml ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/ofbizwebsite/template/HtmlHead.ftl ofbiz/branches/jquery/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/shark/webapp/shark/WEB-INF/web.xml ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/jquery/themes/bluelight/includes/header.ftl ofbiz/branches/jquery/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 5 10:07:56 2010 @@ -1,2 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 +/ofbiz/trunk:951708-960493 Modified: ofbiz/branches/jquery/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/.classpath (original) +++ ofbiz/branches/jquery/.classpath Mon Jul 5 10:07:56 2010 @@ -43,9 +43,15 @@ <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/> <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.9.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ws-commons-java5-1.0.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ws-commons-util-1.0.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/> <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.3.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/> @@ -84,7 +90,7 @@ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/> - <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-1.7-rc-2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.7.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> <classpathentry kind="lib" path="framework/birt/lib/chartengineapi.jar"/> @@ -144,11 +150,6 @@ <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-java5-1.0.1.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/ws-commons-util-1.0.1.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-client-3.0.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-common-3.0.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/xmlrpc-server-3.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar"/> <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar"/> <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar"/> Modified: ofbiz/branches/jquery/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/LICENSE (original) +++ ofbiz/branches/jquery/LICENSE Mon Jul 5 10:07:56 2010 @@ -31,6 +31,8 @@ ofbiz/trunk/framework/base/lib/mx4j-remo ofbiz/trunk/framework/base/lib/nekohtml.jar ofbiz/trunk/framework/base/lib/resolver-2.9.1.jar ofbiz/trunk/framework/base/lib/serializer-2.9.1.jar +ofbiz/trunk/framework/base/lib/ws-commons-java5-1.0.1.jar +ofbiz/trunk/framework/base/lib/ws-commons-util-1.0.2.jar ofbiz/trunk/framework/base/lib/xercesImpl-2.9.1.jar ofbiz/trunk/framework/base/lib/xml-apis-2.9.1.jar ofbiz/trunk/framework/base/lib/commons/commons-beanutils-1.7.0.jar @@ -64,7 +66,10 @@ ofbiz/trunk/framework/base/lib/j2eespecs ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar -ofbiz/trunk/framework/base/lib/scripting/groovy-1.7-rc-2.jar +ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.3.jar +ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar +ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar +ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar @@ -104,11 +109,6 @@ ofbiz/trunk/framework/webapp/lib/ezmorph ofbiz/trunk/framework/webapp/lib/rome-0.9.jar ofbiz/trunk/framework/webapp/lib/serializer-2.7.0.jar ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar -ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar -ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar -ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar -ofbiz/trunk/framework/webapp/lib/ws-commons-java5-1.0.1.jar -ofbiz/trunk/framework/webapp/lib/ws-commons-util-1.0.1.jar ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-2.1.1.jar ofbiz/trunk/framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml Mon Jul 5 10:07:56 2010 @@ -21,9 +21,15 @@ <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="AccountingFinAccountInactiveStatusError"> <value xml:lang="en">FinAccount must be in active status</value> + <value xml:lang="fr">Le compte financier doit être dans un état actif</value> </property> <property key="AccountingFinAccountStatusNotValidError"> <value xml:lang="en">FinAccount not in valid status</value> + <value xml:lang="fr">Le compte financier n'est pas dans un état valide</value> + </property> + <property key="AccountingPartyAcctgPreferenceNotDefine"> + <value xml:lang="en">Acctg preference not define</value> + <value xml:lang="fr">Aucune configuration sur les préférences de gestion encore définie pour votre société</value> </property> <property key="AccountingPayPalCommunicationError"> <value xml:lang="en">A problem occurred while communicating with PayPal, please try again or select a different checkout method</value> @@ -32,6 +38,7 @@ </property> <property key="AccountingPayPalShoppingCartIsEmpty"> <value xml:lang="en">Shopping cart is empty, cannot proceed with Express Checkout</value> + <value xml:lang="fr">Votre panier est vide, vous ne pouvez pas effectuer une validation express</value> <value xml:lang="hi_IN">शà¥à¤ªà¤¿à¤à¤ à¤à¤¾à¤°à¥à¤ à¤à¤¾à¤²à¥ हà¥, à¤à¤à¥à¤¸à¤ªà¥à¤°à¥à¤¸ à¤à¥à¤à¤à¤à¤ à¤à¥ साथ à¤à¤à¥ नहà¥à¤ बढ़ सà¤à¤¤à¥</value> <value xml:lang="it">Il carrello è vuoto, non posso procedere con il checkout Express</value> </property> @@ -100,41 +107,49 @@ </property> <property key="worldPayEvents.failedToExecuteServiceCreatePaymentFromPreference"> <value xml:lang="en">Failed To Execute Service CreatePaymentFromPreference</value> + <value xml:lang="fr">Ãchec sur l'execution du service de création d'un payment suivant les préférence (CreatePaymentFromPreference)</value> <value xml:lang="hi_IN">सरà¥à¤µà¤¿à¤¸ CreatePaymentFromPreference पर ठमल(execute) à¤à¤°à¤¨à¥ मà¥à¤ ठसफल</value> <value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value> </property> <property key="worldPayEvents.noValidOrderIdReturned"> <value xml:lang="en">No Valid OrderId Returned</value> + <value xml:lang="fr">Référence commande retournée n'est pas valide</value> <value xml:lang="hi_IN">मानà¥à¤¯ OrderId वापस नहà¥à¤ लà¥à¤à¤¾</value> <value xml:lang="it">Nessun numero ordine restituito</value> </property> <property key="worldPayEvents.problemsConnectingWithWorldPay"> <value xml:lang="en">Problems Connecting With WorldPay</value> + <value xml:lang="fr">Problème rencontré dans la connexion avec WorldPay</value> <value xml:lang="hi_IN">WorldPay à¤à¥ साथ à¤à¥à¤¡à¤¼à¤¨à¥ मà¥à¤ समसà¥à¤¯à¤¾</value> <value xml:lang="it">Problema nella connessione con WorldPay</value> </property> <property key="worldPayEvents.problemsGettingAuthenticationUser"> <value xml:lang="en">Problems Getting Authentication User</value> + <value xml:lang="en">Problème sur l'authentification de l'utilisateur</value> <value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾(user) à¤à¥ पà¥à¤°à¤®à¤¾à¤£à¥à¤à¤°à¤£ मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> <value xml:lang="it">Problema durante l'autenticazione utente</value> </property> <property key="worldPayEvents.problemsGettingInstId"> <value xml:lang="en">Problems Getting Inst Id</value> + <value xml:lang="fr">Problème de récupération de l'Inst Id</value> <value xml:lang="hi_IN">Inst Id मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> <value xml:lang="it">Problema nel ricavare il parametro Inst Id</value> </property> <property key="worldPayEvents.problemsGettingInstIdToInteger"> <value xml:lang="en">Problems Getting Inst Id To Integer</value> + <value xml:lang="fr">Problème de récupération de l'Inst Id vers un nombre</value> <value xml:lang="hi_IN">Inst Id सॠInteger मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> <value xml:lang="it">Problema nel convertire il parametro Inst Id ad intero</value> </property> <property key="worldPayEvents.problemsGettingMerchantConfiguration"> <value xml:lang="en">Problems Getting Merchant Configuration</value> + <value xml:lang="fr">Problème de récupération de la configuration marchand</value> <value xml:lang="hi_IN">वà¥à¤¯à¤¾à¤ªà¤¾à¤°à¥ विनà¥à¤¯à¤¾à¤¸ मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> <value xml:lang="it">Problema nel ricavare la configurazione del negoziante</value> </property> <property key="worldPayEvents.problemsGettingOrderHeader"> <value xml:lang="en">Problems Getting OrderHeader</value> + <value xml:lang="fr">Problème de récupération de la commande</value> <value xml:lang="hi_IN">OrderHeader मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> <value xml:lang="it">Problema nel ricavare la testata ordine</value> </property> Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Mon Jul 5 10:07:56 2010 @@ -958,15 +958,24 @@ under the License. <Enumeration description="Inventory Item Cost" enumCode="INV_COST" enumId="COGS_INV_COST" sequenceId="04" enumTypeId="COGS_METHODS"/> <!-- inventory sequencing mode for accounting preferences --> + <CustomMethodType customMethodTypeId="HOOK" parentTypeId="HOOK" hasTable="N" description="Custom Methode Type define HOOK method to resolve specific sequence"/> + <CustomMethodType customMethodTypeId="INVOICE_HOOK" parentTypeId="HOOK" hasTable="N" description="Invoice Sequence methods"/> + <CustomMethod customMethodId="INV_HOOK_ENF_SEQ" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> + <CustomMethod customMethodId="INV_HOOK_RES_YR" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequence-restart" description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)"/> + <!-- quote sequencing mode for accounting preferences --> + <CustomMethodType customMethodTypeId="QUOTE_HOOK" parentTypeId="HOOK" hasTable="N" description="Quote Sequence methods"/> + <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> + <!-- order sequencing mode for accounting preferences --> + <CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/> + <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/> + <!-- Deprecated sequencing mode by enumeration --> <EnumerationType description="Invoice Sequence Mode" enumTypeId="INVOICE_SEQMD" hasTable="N" parentTypeId=""/> <Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="INVSQ_STANDARD" sequenceId="01" enumTypeId="INVOICE_SEQMD"/> <Enumeration description="Enforced Sequence (no gaps, per organization)" enumCode="ENF_SEQ" enumId="INVSQ_ENF_SEQ" sequenceId="02" enumTypeId="INVOICE_SEQMD"/> <Enumeration description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)" enumCode="RESTARTYR" enumId="INVSQ_RESTARTYR" sequenceId="03" enumTypeId="INVOICE_SEQMD"/> - <!-- quote sequencing mode for accounting preferences --> <EnumerationType description="Quote Sequence Mode" enumTypeId="QUOTE_SEQMD" hasTable="N" parentTypeId=""/> <Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="QTESQ_STANDARD" sequenceId="01" enumTypeId="QUOTE_SEQMD"/> <Enumeration description="Enforced Sequence (no gaps, per organization)" enumCode="ENF_SEQ" enumId="QTESQ_ENF_SEQ" sequenceId="02" enumTypeId="QUOTE_SEQMD"/> - <!-- order sequencing mode for accounting preferences --> <EnumerationType description="Order Sequence Mode" enumTypeId="ORDER_SEQMD" hasTable="N" parentTypeId=""/> <Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="ODRSQ_STANDARD" sequenceId="01" enumTypeId="ORDER_SEQMD"/> <Enumeration description="Enforced Sequence (no gaps, per organization)" enumCode="ENF_SEQ" enumId="ODRSQ_ENF_SEQ" sequenceId="02" enumTypeId="ORDER_SEQMD"/> Modified: ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml Mon Jul 5 10:07:56 2010 @@ -209,9 +209,9 @@ under the License. <GlJournal organizationPartyId="Company" glJournalId="ERROR_JOURNAL" glJournalName="Suspense transactions"/> <PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120" cogsMethodId="COGS_LIFO" baseCurrencyUomId="USD" - invoiceSequenceEnumId="INVSQ_ENF_SEQ" invoiceIdPrefix="CI" - quoteSequenceEnumId="INVSQ_ENF_SEQ" quoteIdPrefix="CQ" - orderSequenceEnumId="INVSQ_ENF_SEQ" orderIdPrefix="CO" + invoiceSeqCustMethId="INV_HOOK_ENF_SEQ" invoiceIdPrefix="CI" + quoteSeqCustMethId="QUOTE_HOOK_ENF_SEQ" quoteIdPrefix="CQ" + orderSeqCustMethId="ORDER_HOOK_ENF_SEQ" orderIdPrefix="CO" errorGlJournalId="ERROR_JOURNAL"/> <!-- Chart Of Accounts --> Modified: ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml Mon Jul 5 10:07:56 2010 @@ -2306,15 +2306,15 @@ under the License. <field name="taxFormId" type="id-ne"/> <field name="cogsMethodId" type="id-ne"/> <field name="baseCurrencyUomId" type="id-ne"/> - <field name="invoiceSequenceEnumId" type="id-ne"/> + <field name="invoiceSeqCustMethId" type="id-ne"/> <field name="invoiceIdPrefix" type="very-short"/> <field name="lastInvoiceNumber" type="numeric"/> <field name="lastInvoiceRestartDate" type="date-time"/> <field name="useInvoiceIdForReturns" type="indicator"/> - <field name="quoteSequenceEnumId" type="id-ne"/> + <field name="quoteSeqCustMethId" type="id-ne"/> <field name="quoteIdPrefix" type="very-short"/> <field name="lastQuoteNumber" type="numeric"/> - <field name="orderSequenceEnumId" type="id-ne"/> + <field name="orderSeqCustMethId" type="id-ne"/> <field name="orderIdPrefix" type="very-short"/> <field name="lastOrderNumber" type="numeric"/> <field name="refundPaymentMethodId" type="id"/> @@ -2324,6 +2324,10 @@ under the License. If the error journal is set, if the GL posting fails for some reason the triggering operation (finalizing an invoice or payment or whatever) would NOT roll back, instead the partial GL post would be placed into the error journal. </description> </field> + <!-- Deprecated Field--> + <field name="oldInvoiceSequenceEnumId" type="id-ne"/> + <field name="oldOrderSequenceEnumId" type="id-ne"/> + <field name="oldQuoteSequenceEnumId" type="id-ne"/> <prim-key field="partyId"/> <relation type="one" rel-entity-name="Party" fk-name="ACTG_PREF_PTY"> <key-map field-name="partyId"/> @@ -2337,14 +2341,14 @@ under the License. <relation type="one" fk-name="ACCTGPREF_CURNCY" rel-entity-name="Uom"> <key-map field-name="baseCurrencyUomId" rel-field-name="uomId"/> </relation> - <relation type="one" fk-name="ACTGPREF_INVSQ" title="InvoiceSequence" rel-entity-name="Enumeration"> - <key-map field-name="invoiceSequenceEnumId" rel-field-name="enumId"/> + <relation type="one" fk-name="ACTGPREF_INVCM" title="Invoice" rel-entity-name="CustomMethod"> + <key-map field-name="invoiceSeqCustMethId" rel-field-name="customMethodId"/> </relation> - <relation type="one" fk-name="ACTGPREF_QTESQ" title="QuoteSequence" rel-entity-name="Enumeration"> - <key-map field-name="quoteSequenceEnumId" rel-field-name="enumId"/> + <relation type="one" fk-name="ACTGPREF_QTECM" title="Quote" rel-entity-name="CustomMethod"> + <key-map field-name="quoteSeqCustMethId" rel-field-name="customMethodId"/> </relation> - <relation type="one" fk-name="ACTGPREF_ODRSQ" title="OrderSequence" rel-entity-name="Enumeration"> - <key-map field-name="orderSequenceEnumId" rel-field-name="enumId"/> + <relation type="one" fk-name="ACTGPREF_ODRCM" title="Order" rel-entity-name="CustomMethod"> + <key-map field-name="orderSeqCustMethId" rel-field-name="customMethodId"/> </relation> <relation type="one" rel-entity-name="PaymentMethod"> <key-map field-name="refundPaymentMethodId" rel-field-name="paymentMethodId"/> @@ -2352,6 +2356,16 @@ under the License. <relation type="one" fk-name="ACTGPREF_GLJRNL" rel-entity-name="GlJournal"> <key-map field-name="errorGlJournalId" rel-field-name="glJournalId"/> </relation> + <!-- Deprecated relation--> + <relation type="one" fk-name="ACTGPREF_INVSQ" title="InvoiceSequence" rel-entity-name="Enumeration"> + <key-map field-name="oldInvoiceSequenceEnumId" rel-field-name="enumId"/> + </relation> + <relation type="one" fk-name="ACTGPREF_QTESQ" title="QuoteSequence" rel-entity-name="Enumeration"> + <key-map field-name="oldQuoteSequenceEnumId" rel-field-name="enumId"/> + </relation> + <relation type="one" fk-name="ACTGPREF_ODRSQ" title="OrderSequence" rel-entity-name="Enumeration"> + <key-map field-name="oldOrderSequenceEnumId" rel-field-name="enumId"/> + </relation> </entity> <entity entity-name="ProductAverageCost" package-name="org.ofbiz.accounting.ledger" Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Jul 5 10:07:56 2010 @@ -26,80 +26,36 @@ under the License. <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference" auto-field-map="false"> <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-one> - <log level="info" message="In getNextInvoiceId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/> + <log level="info" message="In getNextInvoiceId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/> - <if> - <condition> - <if-compare field="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_ENF_SEQ"/> - </condition> - <then> - <log level="info" message="In createInvoice sequence enum INVSQ_ENF_SEQ"/> - <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> - <if-not-empty field="partyAcctgPreference.lastInvoiceNumber"> - <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"> - <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/> - <number value="1"/> - </calculate> - <else> - <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> - </else> - </if-not-empty> - <store-value value-field="partyAcctgPreference"/> - <set from-field="partyAcctgPreference.lastInvoiceNumber" field="invoiceIdTemp"/> - </then> - <else-if> - <condition> - <if-compare field="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_RESTARTYR"/> - </condition> - <then> - <log level="info" message="In createInvoice sequence enum INVSQ_RESTARTYR"/> - <!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year --> - - <now-timestamp field="nowTimestamp"/> - <if-empty field="partyAcctgPreference.lastInvoiceRestartDate"> - <!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 --> - <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> - <set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/> - <else> - <!-- first figure out if we need to reset the lastInvoiceNumber; is the lastInvoiceRestartDate after the fiscalYearStartMonth/Day for this year? --> - <calculate field="zeroLong" type="Long"><number value="0"/></calculate> - <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field="curYearFiscalStartDate"> - <field field="nowTimestamp" type="java.sql.Timestamp"/> - <field field="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/> - <field field="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/> - <field field="zeroLong" type="java.lang.Number"/> - </call-class-method> - <if> - <condition> - <and> - <if-compare-field field="partyAcctgPreference.lastInvoiceRestartDate" to-field="curYearFiscalStartDate" operator="less" type="Timestamp"/> - <if-compare-field field="nowTimestamp" to-field="curYearFiscalStartDate" operator="greater-equals" type="Timestamp"/> - </and> - </condition> - <then> - <!-- less than fiscal year start, we need to reset it --> - <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> - <set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/> - </then> - <else> - <!-- greater than or equal to fiscal year start or nowTimestamp hasn't yet hit the current year fiscal start date, we're okay, just increment --> - <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"> - <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/> - <number value="1"/> - </calculate> - </else> - </if> - </else> - </if-empty> - <store-value value-field="partyAcctgPreference"/> + <if-not-empty field="partyAcctgPreference"> + <get-related-one relation-name="InvoiceCustomMethod" value-field="partyAcctgPreference" to-value-field="customMethod"/> + <else> + <property-to-field field="errorPartyPerf" resource="AccountingErrorUiLabels" property="AccountingPartyAcctgPreferenceNotDefine"/> + <log level="warning" message="errorPartyPerf" /> + </else> + </if-not-empty> + + <if-not-empty field="customMethod"> + <set field="customMethodName" from-field="customMethod.customMethodName"/> + <else><!-- retreive service from deprecated enumeration --> + <if-compare operator="equals" value="INVSQ_ENF_SEQ" field="partyAcctgPreference.oldInvoiceSequenceEnumId"> + <set field="customMethodName" value="invoiceSequence-enforced"/> + </if-compare> + <if-compare operator="equals" value="INVSQ_RESTARTYR" field="partyAcctgPreference.oldInvoiceSequenceEnumId"> + <set field="customMethodName" value="invoiceSequence-restart"/> + </if-compare> + </else> + </if-not-empty> - <!-- get the current year string for prefix, etc; simple 4 digit year date string (using system defaults) --> - <set field="curYearString" value="${str:toString(date:year(partyAcctgPreference.lastInvoiceRestartDate, util:defaultTimeZone(), util:defaultLocale()))}"/> - <set field="invoiceIdTemp" value="${curYearString}-${str:toString(partyAcctgPreference.lastInvoiceNumber)}"/> - </then> - </else-if> + <if-not-empty field="customMethodName"> + <set-service-fields service-name="${customMethodName}" map="parameters" to-map="customMethodMap"/> + <set field="customMethodMap.partyAcctgPreference" from-field="partyAcctgPreference"/> + <call-service service-name="${customMethodName}" in-map-name="customMethodMap"> + <result-to-field result-name="invoiceId" field="invoiceIdTemp"/> + </call-service> <else> - <log level="info" message="In createInvoice sequence enum INVSQ_STANDARD"/> + <log level="info" message="In createInvoice sequence enum Standard"/> <!-- default to the default sequencing: INVSQ_STANDARD --> <set from-field="parameters.invoiceId" field="invoiceIdTemp"/> <if-empty field="invoiceIdTemp"> @@ -111,13 +67,80 @@ under the License. </else> </if-empty> </else> - </if> + </if-not-empty> <!-- use invoiceIdTemp along with the invoiceIdPrefix to create the real ID --> <set field="invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}${str:toString(invoiceIdTemp)}"/> <field-to-result field="invoiceId" result-name="invoiceId"/> </simple-method> + <simple-method method-name="invoiceSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)"> + <log level="info" message="In createInvoice sequence enum Enforced"/> + <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/> + <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom --> + + <if-not-empty field="partyAcctgPreference.lastInvoiceNumber"> + <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"> + <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/> + <number value="1"/> + </calculate> + <else> + <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> + </else> + </if-not-empty> + <store-value value-field="partyAcctgPreference"/> + <set from-field="partyAcctgPreference.lastInvoiceNumber" field="invoiceId"/> + <field-to-result field="invoiceId" result-name="invoiceId"/> + </simple-method> + + <simple-method method-name="invoiceSequence-restart" short-description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)"> + <log level="info" message="In createInvoice sequence enum Restart"/> + <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/> + <!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year --> + + <now-timestamp field="nowTimestamp"/> + <if-empty field="partyAcctgPreference.lastInvoiceRestartDate"> + <!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 --> + <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> + <set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/> + <else> + <!-- first figure out if we need to reset the lastInvoiceNumber; is the lastInvoiceRestartDate after the fiscalYearStartMonth/Day for this year? --> + <calculate field="zeroLong" type="Long"><number value="0"/></calculate> + <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field="curYearFiscalStartDate"> + <field field="nowTimestamp" type="java.sql.Timestamp"/> + <field field="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/> + <field field="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/> + <field field="zeroLong" type="java.lang.Number"/> + </call-class-method> + <if> + <condition> + <and> + <if-compare-field field="partyAcctgPreference.lastInvoiceRestartDate" to-field="curYearFiscalStartDate" operator="less" type="Timestamp"/> + <if-compare-field field="nowTimestamp" to-field="curYearFiscalStartDate" operator="greater-equals" type="Timestamp"/> + </and> + </condition> + <then> + <!-- less than fiscal year start, we need to reset it --> + <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> + <set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/> + </then> + <else> + <!-- greater than or equal to fiscal year start or nowTimestamp hasn't yet hit the current year fiscal start date, we're okay, just increment --> + <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"> + <calcop operator="add" field="partyAcctgPreference.lastInvoiceNumber"/> + <number value="1"/> + </calculate> + </else> + </if> + </else> + </if-empty> + <store-value value-field="partyAcctgPreference"/> + + <!-- get the current year string for prefix, etc; simple 4 digit year date string (using system defaults) --> + <set field="curYearString" value="${str:toString(date:year(partyAcctgPreference.lastInvoiceRestartDate, util:defaultTimeZone(), util:defaultLocale()))}"/> + <set field="invoiceId" value="${curYearString}-${str:toString(partyAcctgPreference.lastInvoiceNumber)}"/> + <field-to-result field="invoiceId" result-name="invoiceId"/> + </simple-method> <simple-method method-name="createInvoice" short-description="Create a new Invoice"> <now-timestamp field="nowTimestamp"/> @@ -127,6 +150,7 @@ under the License. <!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied else use it from the input --> <if-empty field="parameters.invoiceId"> + <set-service-fields service-name="getNextInvoiceId" to-map="getNextInvoiceIdMap" map="parameters"/> <set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/> <call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap"> <result-to-field result-name="invoiceId" field="parameters.invoiceId"/> Modified: ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/branches/jquery/applications/accounting/servicedef/services_invoice.xml Mon Jul 5 10:07:56 2010 @@ -28,10 +28,24 @@ under the License. <service name="getNextInvoiceId" engine="simple" location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="getNextInvoiceId"> <description>Get the Next Invoice ID According to Settings on the PartyAcctgPreference Entity for the given Party</description> + <implements service="createInvoice"/> <attribute name="partyId" type="String" mode="IN" optional="false"/> <attribute name="invoiceId" type="String" mode="OUT" optional="false"/> </service> + <service name="invoiceSequence-enforced" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequence-enforced"> + <implements service="getNextInvoiceId"/> + <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/> + <override name="invoiceId" type="Long" mode="OUT"/> + </service> + + <service name="invoiceSequence-restart" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequence-restart"> + <implements service="getNextInvoiceId"/> + <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/> + </service> + <!-- Invoice services --> <service name="createInvoice" engine="simple" default-entity-name="Invoice" location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="createInvoice"> Modified: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original) +++ ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Mon Jul 5 10:07:56 2010 @@ -775,9 +775,11 @@ public class PayPalServices { result.put("authRefNum", "N/A"); result.put("processAmount", BigDecimal.ZERO); if (errors.size() == 1) { - result.put("responseMessage", errors.get(0)); + Map.Entry<String, String> error = errors.entrySet().iterator().next(); + result.put("authCode", error.getKey()); + result.put("authMessage", error.getValue()); } else { - result.put("responseMessage", "Multiple errors occurred, please refer to the gateway response messages"); + result.put("authMessage", "Multiple errors occurred, please refer to the gateway response messages"); result.put("internalRespMsgs", errors); } } else { @@ -824,9 +826,11 @@ public class PayPalServices { result.put("captureRefNum", "N/A"); result.put("captureAmount", BigDecimal.ZERO); if (errors.size() == 1) { - result.put("responseMessage", errors.get(0)); + Map.Entry<String, String> error = errors.entrySet().iterator().next(); + result.put("captureCode", error.getKey()); + result.put("captureMessage", error.getValue()); } else { - result.put("responseMessage", "Multiple errors occurred, please refer to the gateway response messages"); + result.put("captureMessage", "Multiple errors occurred, please refer to the gateway response messages"); result.put("internalRespMsgs", errors); } } else { @@ -867,9 +871,11 @@ public class PayPalServices { result.put("releaseRefNum", authTrans.getString("referenceNum")); result.put("releaseAmount", BigDecimal.ZERO); if (errors.size() == 1) { - result.put("responseMessage", errors.get(0)); + Map.Entry<String, String> error = errors.entrySet().iterator().next(); + result.put("releaseCode", error.getKey()); + result.put("releaseMessage", error.getValue()); } else { - result.put("responseMessage", "Multiple errors occurred, please refer to the gateway response messages"); + result.put("releaseMessage", "Multiple errors occurred, please refer to the gateway response messages"); result.put("internalRespMsgs", errors); } } else { @@ -916,9 +922,11 @@ public class PayPalServices { result.put("refundRefNum", captureTrans.getString("referenceNum")); result.put("refundAmount", BigDecimal.ZERO); if (errors.size() == 1) { - result.put("responseMessage", errors.get(0)); + Map.Entry<String, String> error = errors.entrySet().iterator().next(); + result.put("refundCode", error.getKey()); + result.put("refundMessage", error.getValue()); } else { - result.put("responseMessage", "Multiple errors occurred, please refer to the gateway response messages"); + result.put("refundMessage", "Multiple errors occurred, please refer to the gateway response messages"); result.put("internalRespMsgs", errors); } } else { Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -61,7 +61,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/accounting/webapp/ar/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/ar/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/ar/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml Mon Jul 5 10:07:56 2010 @@ -386,7 +386,7 @@ under the License. <menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2"> <actions> - <set field="isDisbursement" value="${bsh:if(payment!=void)org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> + <set field="isDisbursement" value="${bsh:if(payment!=void)return org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> </actions> <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create" > <condition> Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static:/js</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static:/js</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -60,7 +60,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/humanres/webapp/humanres/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/webapp/humanres/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/humanres/webapp/humanres/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -60,7 +60,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Mon Jul 5 10:07:56 2010 @@ -41,17 +41,6 @@ if (productionRunId) { context.orderItems = orderItems; } - // Find all the work efforts that must be completed before this one. - mandatoryWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdTo : productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"])); - if (mandatoryWorkEfforts) { - context.mandatoryWorkEfforts = mandatoryWorkEfforts; - } - // Find all the work efforts that can start after this one. - dependentWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdFrom : productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"])); - if (dependentWorkEfforts) { - context.dependentWorkEfforts = dependentWorkEfforts; - } - quantityToProduce = productionRun.getGenericValue().get("quantityToProduce") ?: 0.0; // Find the inventory items produced Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy Mon Jul 5 10:07:56 2010 @@ -48,16 +48,6 @@ if (productionRunId) { if (orderItems) { context.orderItems = orderItems; } - // Find all the work efforts that must be completed before this one. - mandatoryWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdTo : productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"])); - if (mandatoryWorkEfforts) { - context.mandatoryWorkEfforts = mandatoryWorkEfforts; - } - // Find all the work efforts that can start after this one. - dependentWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdFrom : productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"])); - if (dependentWorkEfforts) { - context.dependentWorkEfforts = dependentWorkEfforts; - } // RoutingTasks list context.productionRunRoutingTasks = productionRun.getProductionRunRoutingTasks(); context.quantity = productionRun.getQuantity(); // this is useful to compute the total estimates runtime in the form Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -59,7 +59,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Jul 5 10:07:56 2010 @@ -83,6 +83,25 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="500"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy"/> + + <set field="productionRunId" from-field="parameters.productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> + </entity-one> + <!-- Find all the work efforts that must be completed before this one. --> + <entity-condition entity-name="WorkEffortAssoc" list="mandatoryWorkEfforts"> + <condition-list> + <condition-expr field-name="workEffortIdTo" from-field="productionRunId"/> + <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> + </condition-list> + </entity-condition> + <!-- Find all the work efforts that are dependent from this one. --> + <entity-condition entity-name="WorkEffortAssoc" list="dependentWorkEfforts"> + <condition-list> + <condition-expr field-name="workEffortIdFrom" from-field="productionRunId"/> + <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> + </condition-list> + </entity-condition> </actions> <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> @@ -90,10 +109,27 @@ under the License. <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction"> <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/> <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> - </platform-specific> </screenlet> + <section> + <condition> + <not><if-empty field="mandatoryWorkEfforts"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + </widgets> + </section> + <section> + <condition> + <not><if-empty field="dependentWorkEfforts"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> + <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + </widgets> + </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> </screenlet> @@ -126,6 +162,25 @@ under the License. <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy"/> + + <set field="productionRunId" from-field="parameters.productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> + </entity-one> + <!-- Find all the work efforts that must be completed before this one. --> + <entity-condition entity-name="WorkEffortAssoc" list="mandatoryWorkEfforts"> + <condition-list> + <condition-expr field-name="workEffortIdTo" from-field="productionRunId"/> + <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> + </condition-list> + </entity-condition> + <!-- Find all the work efforts that are dependent from this one. --> + <entity-condition entity-name="WorkEffortAssoc" list="dependentWorkEfforts"> + <condition-list> + <condition-expr field-name="workEffortIdFrom" from-field="productionRunId"/> + <condition-expr field-name="workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> + </condition-list> + </entity-condition> </actions> <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> @@ -155,14 +210,29 @@ under the License. </screenlet> </widgets> </section> - <screenlet title="${uiLabelMap.ManufacturingAssociatedProductionRuns}"> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> - </platform-specific> - </screenlet> <screenlet title="${uiLabelMap.ManufacturingInventoryItemsProduced}"> <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> </screenlet> + <section> + <condition> + <not><if-empty field="mandatoryWorkEfforts"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + </widgets> + </section> + <section> + <condition> + <not><if-empty field="dependentWorkEfforts"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> + <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + </widgets> + </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> </screenlet> Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -60,7 +60,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |