svn commit: r1090153 [1/20] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1090153 [1/20] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Fri Apr 8 08:07:00 2011 New Revision: 1090153 URL: http://svn.apache.org/viewvc?rev=1090153&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy ofbiz/branches/jackrabbit20100709/framework/base/lib/commons/commons-compress-1.1.jar (with props) ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.5.2.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.5.2.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ca.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ge.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ja.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_si.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_sr.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/version.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/css/ui-lightness/jquery-ui-1.8.11.custom.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.11.custom.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-ar-DZ.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-AU.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-NZ.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-ml.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-rm.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-tj.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.11.custom.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Config.java ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/images/ui-bg_glass_65_ffffff_1x400.png (with props) Removed: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/automaticResize.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/AutomaticResize.ftl ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.pack.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/lib/jquery-1.4.2.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.6.custom.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.6.custom.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/js/jquery-1.4.2.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/products/GZ-1000/detail.png ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/products/GZ-1000/medium.gif Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/main.ftl ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/ap/ApMenus.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/shipment.properties ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/CategoryTree.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageShare.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jackrabbit20100709/build.xml ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/splash/SplashLoader.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/branches/jackrabbit20100709/framework/base/testdef/basetests.xml ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/component-load.xml ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_nl.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/MIT-LICENSE.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.resizable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.selectable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.slider.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.tabs.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.theme.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.accordion.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.all.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.button.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.core.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.datepicker.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.dialog.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.progressbar.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.resizable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.selectable.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.slider.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.tabs.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.theme.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery-ui-i18n.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-ar.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-fr.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-hu.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-no.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-th.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.blind.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.bounce.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.clip.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.core.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.drop.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.explode.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fade.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fold.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.highlight.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.pulsate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.scale.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.shake.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.slide.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.transfer.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.accordion.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.autocomplete.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.button.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.core.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.dialog.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.draggable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.droppable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.mouse.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.position.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.progressbar.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.resizable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.selectable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.slider.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.sortable.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.tabs.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.widget.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.blind.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.bounce.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.clip.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.core.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.drop.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.explode.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fade.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fold.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.highlight.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.pulsate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.scale.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.shake.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.slide.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.transfer.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.accordion.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.autocomplete.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.button.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.core.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.datepicker.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.dialog.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.draggable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.droppable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.mouse.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.position.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.progressbar.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.resizable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.selectable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.slider.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.sortable.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.tabs.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.widget.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/version.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/index.html ofbiz/branches/jackrabbit20100709/framework/resources/templates/build.xml ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/service/config/service.properties ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/StartupLoader.java ofbiz/branches/jackrabbit20100709/framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/startofbiz.sh ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/jackrabbit20100709/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-bg_inset-hard_100_fcfdfd_1x100.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-icons_217bc0_256x240.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/images/ui-icons_d8e7f3_256x240.png ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/javascript.css ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 8 08:07:00 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1078886 +/ofbiz/trunk:962442-1090146 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Fri Apr 8 08:07:00 2011 @@ -473,6 +473,10 @@ <value xml:lang="pt">Adicionar Membro do Grupo de Pagamento</value> <value xml:lang="zh_TW">å¢å æ¯ä»ç¾¤çµæå¡</value> </property> + <property key="AccountingAddTax"> + <value xml:lang="en">Add Tax</value> + <value xml:lang="fr">Ajouter les taxes</value> + </property> <property key="AccountingAddTaxAuthorityGlAccount"> <value xml:lang="de">Steuerkonto hinzufügen</value> <value xml:lang="en">Add TaxAuthority GL Account</value> @@ -2520,6 +2524,10 @@ <value xml:lang="hi_IN">डिवà¥à¤à¤¨à¥à¤ ${partyNameList} सॠसमà¥à¤à¤¿à¤¤ डà¥à¤à¤¾</value> <value xml:lang="pt">Os dados consolidados a partir das divisões ${partyNameList}</value> </property> + <property key="AccountingConfirmationCancelOrder"> + <value xml:lang="en">Do you want to cancel this invoice number ${invoice.invoiceId}?</value> + <value xml:lang="fr">Voulez-vous annuler la facture n° ${invoice.invoiceId} ?</value> + </property> <property key="AccountingCopyAgreement"> <value xml:lang="ar">Ùسخ اÙإتÙاÙÙØ©</value> <value xml:lang="de">Vereinbarung kopieren</value> @@ -4128,6 +4136,7 @@ </property> <property key="AccountingFindApInvoices"> <value xml:lang="en">Find AP Invoices</value> + <value xml:lang="fr">Recherche de factures fournisseur</value> <value xml:lang="hi_IN">à¤à¤ªà¥ (AP) à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value> <value xml:lang="pt">Encontrar Faturas do contas a pagar</value> <value xml:lang="zh_TW">æ¾å°æä»ç¼ç¥¨</value> @@ -4139,6 +4148,7 @@ </property> <property key="AccountingFindApPayments"> <value xml:lang="en">Find AP Payments</value> + <value xml:lang="en">Recherche de paiements fournisseur</value> <value xml:lang="hi_IN">लà¥à¤à¤¾ दà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value> <value xml:lang="pt">Encontrar Pagamentos do contas a pagar</value> <value xml:lang="zh_TW">æ¾å°æä»æ¯ä»</value> @@ -6411,7 +6421,7 @@ <value xml:lang="de">Status auf 'Annulliert'</value> <value xml:lang="en">Status to 'Cancelled'</value> <value xml:lang="es">Status a 'Cancelado'</value> - <value xml:lang="fr">Statut à 'Annullée'</value> + <value xml:lang="fr">Statut à 'Annulée'</value> <value xml:lang="hi_IN">'रदà¥à¤¦' à¤à¥ सà¥à¤¥à¤¿à¤¤à¤¿</value> <value xml:lang="it">Stato a 'Annullato'</value> <value xml:lang="nl">Status naar 'Geannuleerd'</value> @@ -6596,6 +6606,7 @@ </property> <property key="AccountingInvoicesDueSoon"> <value xml:lang="en">Invoices Due Soon</value> + <value xml:lang="fr">Factures à régler prochainementvend</value> <value xml:lang="pt">Faturas devidas em breve</value> </property> <property key="AccountingInvoicesFound"> @@ -6639,6 +6650,7 @@ <property key="AccountingIssueCheck"> <value xml:lang="de">Scheck ausstellen</value> <value xml:lang="en">Issue Check</value> + <value xml:lang="fr">Générer un chèque</value> <value xml:lang="hi_IN">à¤à¥à¤ à¤à¤¾à¤°à¥ à¤à¤°à¥</value> <value xml:lang="pt">Emitir verificação</value> </property> @@ -7609,7 +7621,7 @@ <value xml:lang="de">Keine Rechnungen gefunden</value> <value xml:lang="en">No Invoices Found</value> <value xml:lang="es">No facturas encontradas</value> - <value xml:lang="fr">Aucunefacture trouvée</value> + <value xml:lang="fr">Aucune facture trouvée</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ नहà¥à¤ मिला</value> <value xml:lang="it">Nessuna Fattura Trovata</value> <value xml:lang="nl">Geen facturen gevonden</value> @@ -8366,6 +8378,7 @@ </property> <property key="AccountingPastDueInvoices"> <value xml:lang="en">Past Due Invoices</value> + <value xml:lang="fr">Factures en attente de règlement</value> <value xml:lang="pt">Faturas passdas em débito</value> </property> <property key="AccountingPayOnlyWithBillingAccount"> @@ -9927,6 +9940,7 @@ </property> <property key="AccountingPrintInvoices"> <value xml:lang="en">Print Invoices</value> + <value xml:lang="fr">Imprimer les factures</value> <value xml:lang="pt">Imprimir Faturas</value> </property> <property key="AccountingProblemChangingInvoiceStatusTo"> @@ -10118,6 +10132,7 @@ <property key="AccountingPurchaseInvoices"> <value xml:lang="de">Einkaufsrechnung</value> <value xml:lang="en">Purchase Invoices</value> + <value xml:lang="fr">Factures d'achat</value> <value xml:lang="hi_IN">à¤à¤°à¥à¤¦ à¤à¤¾à¤²à¤¾à¤¨</value> <value xml:lang="pt">Faturas de Compra</value> </property> @@ -10544,6 +10559,7 @@ </property> <property key="AccountingSelectAction"> <value xml:lang="en">Select Action</value> + <value xml:lang="fr">Choisir une action</value> <value xml:lang="hi_IN">à¤à¤¾à¤°à¥à¤¯ à¤à¥à¤¨à¥à¤</value> <value xml:lang="pt">Selecionar Ação</value> </property> @@ -11032,6 +11048,7 @@ </property> <property key="AccountingTaxProductIdCannotCalculate"> <value xml:lang="en">productId don't have value, cannot call calcTax service.</value> + <value xml:lang="fr">Pas de produit associé, le calcul des taxes ne peut être effectué</value> <value xml:lang="it">Codice prodotto non ha nessun valore, non è possibile eseguire il servizio calcTax.</value> <value xml:lang="pt">productId não têm valor, não pode chamar o serviço calcTax.</value> </property> @@ -11805,6 +11822,7 @@ </property> <property key="AccountingVendorParty"> <value xml:lang="en">Vendor Party</value> + <value xml:lang="fr">Réf. vendeur</value> <value xml:lang="hi_IN">विà¤à¥à¤°à¥à¤¤à¤¾ पारà¥à¤à¥</value> <value xml:lang="pt">participante Fornecedor</value> <value xml:lang="zh_TW">ä¾æåæå¡</value> @@ -13360,11 +13378,13 @@ </property> <property key="FormFieldTitle_fromDueDate"> <value xml:lang="en">From Due Date</value> + <value xml:lang="fr">Depuis la date d'échéance</value> <value xml:lang="hi_IN">ठनà¥à¤¤à¤¿à¤® दिनाà¤à¤ सà¥</value> <value xml:lang="pt">Da Data de Vencimento</value> </property> <property key="FormFieldTitle_fromInvoiceDate"> <value xml:lang="en">From Invoice Date</value> + <value xml:lang="fr">Facture depuis la date</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ सà¥</value> <value xml:lang="pt">Da data da fatura</value> </property> @@ -14256,6 +14276,7 @@ </property> <property key="FormFieldTitle_origAmount"> <value xml:lang="en">Orig Amount</value> + <value xml:lang="fr">Montant original</value> <value xml:lang="hi_IN">मà¥à¤² राशि</value> <value xml:lang="it">Importo originale</value> <value xml:lang="pt">Quantia original</value> @@ -14264,6 +14285,7 @@ </property> <property key="FormFieldTitle_origCurrencyUomId"> <value xml:lang="en">Orig Currency Uom Id</value> + <value xml:lang="fr">Devise originale</value> <value xml:lang="hi_IN">मà¥à¤² मà¥à¤¦à¥à¤°à¤¾ माप à¤à¥ à¤à¤à¤¾à¤(Uom) à¤à¥à¤°à¤®à¤¾à¤à¤</value> <value xml:lang="it">Valuta di origine</value> <value xml:lang="pt">ID de UDM da moeda original</value> @@ -15485,11 +15507,13 @@ </property> <property key="FormFieldTitle_thruDueDate"> <value xml:lang="en">Thru Due Date</value> + <value xml:lang="fr">Jusqu'à la date d'échéance</value> <value xml:lang="hi_IN">ठनà¥à¤¤à¤¿à¤® दिनाà¤à¤ तà¤</value> <value xml:lang="pt">Data de Vencimento do débito</value> </property> <property key="FormFieldTitle_thruInvoiceDate"> <value xml:lang="en">Thru Invoice Date</value> + <value xml:lang="fr">Jusqu'à la date de facture</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ तà¤</value> <value xml:lang="pt">Data de vencimento da fatura</value> </property> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Fri Apr 8 08:07:00 2011 @@ -126,7 +126,7 @@ under the License. <set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/> </else> </if-empty> - <field-to-result field="agreementId" result-name="agreementId"/> + <field-to-result field="newEntity.agreementId" result-name="agreementId"/> <field-to-result field="newEntity.agreementItemSeqId" result-name="agreementItemSeqId"/> <!-- finally create the record (should not exist already)--> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Apr 8 08:07:00 2011 @@ -115,7 +115,7 @@ public class InvoiceServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); try { - List<GenericValue> orderItems = delegator.findByAnd("OrderItem", UtilMisc.toMap("orderId", (String) context.get("orderId"))); + List<GenericValue> orderItems = delegator.findByAnd("OrderItem", UtilMisc.toMap("orderId", (String) context.get("orderId")), UtilMisc.toList("orderItemSeqId")); if (orderItems.size() > 0) { context.put("billItems", orderItems); } Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Apr 8 08:07:00 2011 @@ -2410,6 +2410,7 @@ public class PaymentGatewayServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentRefundError", locale)); } + refundResponse.putAll(ServiceUtil.returnSuccess("Payment #" + refundResponse.get("paymentId") +" is refunded successfully with amount " + refundResponse.get("refundAmount") +" for manual transaction.")); return refundResponse; } Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/main.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/main.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/main.ftl Fri Apr 8 08:07:00 2011 @@ -70,14 +70,14 @@ under the License. <td> <ul> <#list invoiceTypes as invoiceType> -<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)!invoiceType.invoiceTypeId}</a></li> </#list> </ul> </td> <td> <ul> <#list invoiceStatus as status> -<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)!status.statusId}</a></li> </#list> </ul> </td> @@ -97,7 +97,7 @@ under the License. <ul> <#list paymentTypes as paymentType> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)!paymentType.paymentTypeId}</a></li> </#list> </ul> </td> @@ -106,7 +106,7 @@ under the License. <td> <ul> <#list paymentMethodTypes as paymentMethodType> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)!paymentMethodType.paymentMethodTypeId}</a></li> </#list> </ul> </td> @@ -114,7 +114,7 @@ under the License. <td> <ul> <#list paymentStatus as status> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)!status.statusId}</a></li> </#list> </ul> </td> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml Fri Apr 8 08:07:00 2011 @@ -307,7 +307,7 @@ under the License. </or> </and> </condition> - <link target="setInvoiceStatus" request-confirmation="true" confirmation-message="You want to cancel this invoice number ${invoice.invoiceId}?"> + <link target="setInvoiceStatus" request-confirmation="true" confirmation-message="${uiLabelMap.AccountingConfirmationCancelOrder}"> <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> <parameter param-name="statusId" value="INVOICE_CANCELLED"/> </link> @@ -327,7 +327,7 @@ under the License. <parameter param-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/> </link> </menu-item> - <menu-item name="addtax" title="Add Tax"> + <menu-item name="addtax" title="${uiLabelMap.AccountingAddTax}"> <condition> <and> <not><if-empty field="invoice.invoiceId"/></not> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml Fri Apr 8 08:07:00 2011 @@ -135,7 +135,7 @@ under the License. <field position="2" name="dueDate"><display description="${bsh:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field> <field position="1" name="total"><display description="${total}" type="currency" currency="${invoice.currencyUomId}"/></field> <field position="2" name="paidDate"><display description="${bsh:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> - <field position="1" name="referenceNumber"><display/></field> + <field position="1" name="referenceNumber" title="${uiLabelMap.FormFieldTitle_referenceNum}"><display/></field> <field name="currencyUomId"><hidden/></field> </form> @@ -217,8 +217,8 @@ under the License. <field name="amount"><display type="currency" currency="${currencyUomId}"/></field> <field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field> <field name="acctgTransId"><hyperlink description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field> - <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field> - <field name="glJournalId" title="${uiLabelMap.FormFieldTitle_glJournal}"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field> + <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType"/></field> + <field name="glJournalId"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass" description="${description}"/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${lastName} ${groupName}"/></field> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml Fri Apr 8 08:07:00 2011 @@ -27,6 +27,7 @@ under the License. <section> <actions> <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="invoices"/> </actions> <widgets> @@ -165,6 +166,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleInvoiceOverview"/> <set field="tabButtonItem" value="invoiceOverview"/> <set field="invoiceId" from-field="parameters.invoiceId"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/ap/ApMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/ap/ApMenus.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/ap/ApMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/ap/ApMenus.xml Fri Apr 8 08:07:00 2011 @@ -23,7 +23,7 @@ under the License. <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="FindApInvoices"/></menu-item> <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item> <menu-item name="apPaymentGroups" title="${uiLabelMap.AccountingApPaymentGroupMenu}"><link target="FindApPaymentGroups"/></menu-item> - <menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item> + <menu-item name="findVendors" title="${uiLabelMap.AccountingApPageTitleFindVendors}"><link target="findVendors"/></menu-item> <menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item> </menu> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml Fri Apr 8 08:07:00 2011 @@ -51,9 +51,11 @@ under the License. </if-empty> <if-empty field="newEntity.mimeTypeId"> - <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getMimeTypeWithByteBuffer" ret-field="newEntity.mimeTypeId"> - <field field="parameters.uploadedFile" type="java.nio.ByteBuffer"/> - </call-class-method> + <if-not-empty field="parameters.objectInfo"> + <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getMimeTypeWithByteBuffer" ret-field="newEntity.mimeTypeId"> + <field field="parameters.uploadedFile" type="java.nio.ByteBuffer"/> + </call-class-method> + </if-not-empty> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml Fri Apr 8 08:07:00 2011 @@ -88,7 +88,7 @@ <description>Create a DataResource and, possibly, ElectronicText or ImageDataResource</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> - <attribute name="textData" mode="IN" optional="true" type="String"/> + <attribute name="textData" mode="IN" optional="true" type="String" allow-html="safe"/> <attribute name="targetOperationList" type="List" mode="IN" optional="true"/> <attribute name="contentPurposeList" type="List" mode="IN" optional="true"/> <attribute name="skipPermissionCheck" type="String" mode="IN" optional="true"/> @@ -98,7 +98,7 @@ <description>Create a DataResource and, possibly, ElectronicText or ImageDataResource</description> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> - <attribute name="textData" mode="IN" type="String" optional="true"/> + <attribute name="textData" mode="IN" type="String" optional="true" allow-html="safe"/> <attribute name="targetOperationList" type="List" mode="IN" optional="true"/> <attribute name="contentPurposeList" type="List" mode="IN" optional="true"/> <attribute name="skipPermissionCheck" type="String" mode="IN" optional="true"/> @@ -261,11 +261,11 @@ <attribute mode="IN" name="rootDir" optional="true" type="String"/> </service> --> - + <!-- Cleared associated DataResource rendered cache from UtilCache. --> <service name="clearAssociatedRenderCache" engine="java" auth="true" default-entity-name="DataResource" location="org.ofbiz.content.data.DataServices" invoke="clearAssociatedRenderCache"> <auto-attributes include="pk" mode="IN" /> </service> - + </services> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml Fri Apr 8 08:07:00 2011 @@ -82,7 +82,7 @@ under the License. <screen name="navigateContent"> <section> <actions> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> <set field="titleProperty" value="PageTitleNavigateContent"/> <set field="tabButtonItem" value="navigateContent"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml Fri Apr 8 08:07:00 2011 @@ -401,7 +401,7 @@ under the License. <set field="labelTitleProperty" value="PageTitlePreferredContactMech"/> <set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/> - <set field="partyId" from-field="parameters.parm1"/> + <set field="partyId" from-field="parameters.parm0"/> <set field="entityName" value="PartyAndContactMech"/> <set field="searchFields" value="[contactMechId, partyId, infoString, paToName, paAddress1]"/> </actions> Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml Fri Apr 8 08:07:00 2011 @@ -3919,19 +3919,19 @@ <value xml:lang="zh_TW">çºæ¯ä»æ¹å¼è¨ç½®çéé¡ç¡æã</value> </property> <property key="checkevents.not_enough_available_on_account"> - <value xml:lang="de">Nicht genug verfügbar auf Konto #{billingAccountId}.</value> - <value xml:lang="en">Not enough available on account #{billingAccountId}.</value> - <value xml:lang="es">No hay suficiente disponible en la cuenta #{billingAccountId}.</value> - <value xml:lang="fr">Disponibilités insuffisantes sur le compte n°{billingAccountId}.</value> - <value xml:lang="it">Non abbastanza diponibilità sul conto #{billingAccountId}.</value> - <value xml:lang="nl">Not enough available on account #{billingAccountId}.</value> - <value xml:lang="pt_BR">Sem recursos suficientes na conta #{billingAccountId}.</value> - <value xml:lang="ro">Nu este destula disponibilitate in cont #{billingAccountId}.</value> - <value xml:lang="ru">ÐедоÑÑаÑоÑно Ð´Ð»Ñ ÑÑеÑной запиÑи â{billingAccountId}.</value> - <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸³à¹à¸à¹à¸à¹à¹à¸à¹à¹à¸à¸µà¸¢à¸à¸à¸à¹à¸à¸à¸±à¸à¸à¸µ #{billingAccountId}.</value> - <value xml:lang="zh">è´¦æ· #{billingAccountId} éé¢ä¸å¤ã</value> - <value xml:lang="zh_CN">å¸æ·ä½é¢ä¸è¶³#{billingAccountId}.</value> - <value xml:lang="zh_TW">è³¬æ¶ #{billingAccountId} éé¡ä¸å¤ ã</value> + <value xml:lang="de">Nicht genug verfügbar auf Konto ${billingAccountId}.</value> + <value xml:lang="en">Not enough available on account ${billingAccountId}.</value> + <value xml:lang="es">No hay suficiente disponible en la cuenta ${billingAccountId}.</value> + <value xml:lang="fr">Disponibilités insuffisantes sur le compte ${billingAccountId}.</value> + <value xml:lang="it">Non abbastanza diponibilità sul conto ${billingAccountId}.</value> + <value xml:lang="nl">Not enough available on account ${billingAccountId}.</value> + <value xml:lang="pt_BR">Sem recursos suficientes na conta ${billingAccountId}.</value> + <value xml:lang="ro">Nu este destula disponibilitate in cont ${billingAccountId}.</value> + <value xml:lang="ru">ÐедоÑÑаÑоÑно Ð´Ð»Ñ ÑÑеÑной запиÑи ${billingAccountId}.</value> + <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸³à¹à¸à¹à¸à¹à¹à¸à¹à¹à¸à¸µà¸¢à¸à¸à¸à¹à¸à¸à¸±à¸à¸à¸µ ${billingAccountId}.</value> + <value xml:lang="zh">è´¦æ· ${billingAccountId} éé¢ä¸å¤ã</value> + <value xml:lang="zh_CN">å¸æ·ä½é¢ä¸è¶³${billingAccountId}.</value> + <value xml:lang="zh_TW">è³¬æ¶ ${billingAccountId} éé¡ä¸å¤ ã</value> </property> <property key="checkevents.payment_not_cover_this_order"> <value xml:lang="de">Gewählte Zahlweise deckt nicht diese Bestellung.</value> Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Fri Apr 8 08:07:00 2011 @@ -1858,6 +1858,7 @@ </property> <property key="OrderAssociatedProducts"> <value xml:lang="en">Associated Products</value> + <value xml:lang="fr">Produits associés</value> <value xml:lang="pt_BR">Produtos relacionado</value> <value xml:lang="zh_TW">éé£çç¢å</value> </property> @@ -4261,7 +4262,7 @@ <value xml:lang="de">Ist ein Aktionsartikel</value> <value xml:lang="en">Is A Promotional Item</value> <value xml:lang="es">es un Ãtem promocional</value> - <value xml:lang="fr">C'est un article en prommotion</value> + <value xml:lang="fr">C'est un article en promotion</value> <value xml:lang="hi_IN">à¤à¤ पà¥à¤°à¥à¤¤à¥à¤¸à¤¾à¤¹à¤¨ सामान हà¥</value> <value xml:lang="it">E' una Voce Promozionale</value> <value xml:lang="ja">Is a Promotional Item</value> Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 8 08:07:00 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1084618 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1090146 Modified: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Apr 8 08:07:00 2011 @@ -1441,4 +1441,21 @@ under the License. </iterate> <field-to-result field="availabalityList"/> </simple-method> + + <simple-method method-name="createOrderPaymentApplication" short-description="Create Order Payment Application"> + <entity-one value-field="paymentMap" entity-name="Payment"/> + <set field="createCtx.amountApplied" from-field="paymentMap.amount" type="BigDecimal"/> + <set field="createCtx.paymentId" from-field="paymentMap.paymentId"/> + <entity-one value-field="orderPaymentPreMap" entity-name="OrderPaymentPreference"> + <field-map field-name="orderPaymentPreferenceId" from-field="paymentMap.paymentPreferenceId"/> + </entity-one> + <entity-and list="orderItemBilList" entity-name="OrderItemBilling"> + <field-map field-name="orderId" from-field="orderPaymentPreMap.orderId"/> + <order-by field-name="invoiceId"/> + </entity-and> + <if-not-empty field="orderItemBilList"> + <set field="createCtx.invoiceId" from-field="orderItemBilList[0].invoiceId"/> + <call-service service-name="createPaymentApplication" in-map-name="createCtx"/> + </if-not-empty> + </simple-method> </simple-methods> Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml Fri Apr 8 08:07:00 2011 @@ -420,4 +420,10 @@ under the License. <eca service="createUpdateCustomerAndShippingAddress" event="invoke"> <action service="setAnonUserLogin" mode="sync"/> </eca> + + <!-- Use for link the payment and the invoice When Received Payment --> + <eca service="createPaymentFromPreference" event="commit"> + <condition field-name="paymentId" operator="is-not-empty"/> + <action service="createOrderPaymentApplication" mode="sync"/> + </eca> </service-eca> Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml Fri Apr 8 08:07:00 2011 @@ -1115,4 +1115,11 @@ under the License. </description> <auto-attributes mode="IN" include="pk" optional="false"/> </service> + + <!-- Use for link the payment and the invoice When Received Payment --> + <service name="createOrderPaymentApplication" engine="simple" auth="true" + location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderPaymentApplication"> + <description>Create Order Payment Application</description> + <attribute name="paymentId" type="String" mode="IN" optional="false"/> + </service> </services> Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Apr 8 08:07:00 2011 @@ -3942,7 +3942,9 @@ public class OrderServices { return result; } - private static void saveUpdatedCartToOrder(LocalDispatcher dispatcher, Delegator delegator, ShoppingCart cart, Locale locale, GenericValue userLogin, String orderId, Map<String, Object> changeMap, boolean calcTax, boolean deleteItems) throws GeneralException { + private static void saveUpdatedCartToOrder(LocalDispatcher dispatcher, Delegator delegator, ShoppingCart cart, + Locale locale, GenericValue userLogin, String orderId, Map<String, Object> changeMap, boolean calcTax, + boolean deleteItems) throws GeneralException { // get/set the shipping estimates. if it's a SALES ORDER, then return an error if there are no ship estimates int shipGroups = cart.getShipGroupSize(); for (int gi = 0; gi < shipGroups; gi++) { @@ -3987,6 +3989,19 @@ public class OrderServices { throw new GeneralException(ServiceUtil.getErrorMessage(validateResp)); } + // handle OrderHeader fields + String billingAccountId = cart.getBillingAccountId(); + if (UtilValidate.isNotEmpty(billingAccountId)) { + try { + GenericValue orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId)); + orderHeader.set("billingAccountId", billingAccountId); + toStore.add(orderHeader); + } catch (GenericEntityException e) { + Debug.logError(e, module); + throw new GeneralException(e.getMessage()); + } + } + toStore.addAll(cart.makeOrderItems()); toStore.addAll(cart.makeAllAdjustments()); Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Fri Apr 8 08:07:00 2011 @@ -1534,6 +1534,7 @@ public class CheckOutHelper { BigDecimal billingAccountAmt = cart.getBillingAccountAmount(); BigDecimal availableAmount = this.availableAccountBalance(billingAccountId); if (billingAccountAmt.compareTo(availableAmount) > 0) { + Debug.logError("Billing account " + billingAccountId + " has [" + availableAmount + "] available but needs [" + billingAccountAmt + "] for this order", module); Map<String, String> messageMap = UtilMisc.toMap("billingAccountId", billingAccountId); errMsg = UtilProperties.getMessage(resource_error, "checkevents.not_enough_available_on_account", messageMap, (cart != null ? cart.getLocale() : Locale.getDefault())); return ServiceUtil.returnError(errMsg); Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Fri Apr 8 08:07:00 2011 @@ -1772,6 +1772,14 @@ public class ProductPromoWorker { actionResultInfo.totalDiscountAmount = amount; } } + } else if ("PROMO_TAX_PERCENT".equals(productPromoActionEnumId)) { + BigDecimal percentage = (productPromoAction.get("amount") == null ? BigDecimal.ZERO : (productPromoAction.getBigDecimal("amount").movePointLeft(2))).negate(); + BigDecimal amount = cart.getTotalSalesTax().multiply(percentage); + if (amount.compareTo(BigDecimal.ZERO) != 0) { + doOrderPromoAction(productPromoAction, cart, amount, "amount", delegator); + actionResultInfo.ranAction = true; + actionResultInfo.totalDiscountAmount = amount; + } } else { Debug.logError("An un-supported productPromoActionType was used: " + productPromoActionEnumId + ", not performing any action", module); actionResultInfo.ranAction = false; Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Fri Apr 8 08:07:00 2011 @@ -625,4 +625,25 @@ if (product) { // not the best to save info in an action, but this is probably the best place to count a view; it is done async dispatcher.runAsync("countProductView", [productId : productId, weight : new Long(1)], false); + + //get product image from image management + productImageList = []; + productContentAndInfoImageManamentList = delegator.findByAnd("ProductContentAndInfo", ["productId": productId, productContentTypeId : "IMAGE", "statusId" : "IM_APPROVED", "drIsPublic" : "Y"], ["sequenceNum"]); + if(productContentAndInfoImageManamentList) { + productContentAndInfoImageManamentList.each { productContentAndInfoImageManament -> + contentAssocThumbList = delegator.findByAnd("ContentAssoc", [contentId : productContentAndInfoImageManament.contentId, contentAssocTypeId : "IMAGE_THUMBNAIL"]); + contentAssocThumb = EntityUtil.getFirst(contentAssocThumbList); + if(contentAssocThumb) { + imageContentThumb = delegator.findByPrimaryKey("Content", [contentId : contentAssocThumb.contentIdTo]); + if(imageContentThumb) { + productImageThumb = delegator.findByPrimaryKey("ContentDataResourceView", [contentId : imageContentThumb.contentId, drDataResourceId : imageContentThumb.dataResourceId]); + productImageMap = [:]; + productImageMap.productImageThumb = productImageThumb.drObjectInfo; + productImageMap.productImage = productContentAndInfoImageManament.drObjectInfo; + productImageList.add(productImageMap); + } + } + } + context.productImageList = productImageList; + } } Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Fri Apr 8 08:07:00 2011 @@ -216,7 +216,7 @@ under the License. <#if itemProductAssocList?exists && itemProductAssocList?has_content> <tr><td colspan="8"><hr /></td></tr> <tr> - <td>${uiLabelMap.AssociatedProducts}</td> + <td>${uiLabelMap.OrderAssociatedProducts}</td> <td><a href="<@ofbizUrl>LookupAssociatedProducts?productId=${cartLine.getProductId()?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickLookup}</a></td> </tr> <#assign relatedProdCount = 0/> @@ -308,7 +308,7 @@ under the License. <tr> <td colspan="4" nowrap="nowrap" align="right"> <div> - <i>Adjustment</i> - ${adjustmentType.get("description",locale)?if_exists} + <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)?if_exists} <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>: </div> </td> Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl Fri Apr 8 08:07:00 2011 @@ -38,6 +38,7 @@ under the License. <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a> <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> <input type="hidden" name="statusId" value="ORDER_APPROVED"/> + <input type="hidden" name="newStatusId" value="ORDER_APPROVED"/> <input type="hidden" name="setItemStatus" value="Y"/> <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> @@ -240,7 +241,7 @@ under the License. <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td> <td width="5%"> </td> <td valign="top" width="80%"> - <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority"> + <form name="setOrderReservationPriority" method="post" action="<@ofbizUrl>setOrderReservationPriority</@ofbizUrl>"> <input type = "hidden" name="orderId" value="${orderId}"/> <select name="priority"> <option value="1" <#if (orderHeader.priority)?if_exists == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option> Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Fri Apr 8 08:07:00 2011 @@ -97,6 +97,7 @@ under the License. <tr><td colspan="4"><hr /></td></tr> <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content> <#list orderPaymentPreferences as orderPaymentPreference> + <#assign paymentList = orderPaymentPreference.getRelated("Payment")> <#assign pmBillingAddress = {}> <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")> <#if outputted?default("false") == "true"> @@ -177,6 +178,21 @@ under the License. </#if> </td> </tr> + <#if paymentList?has_content> + <tr> + <td align="right" valign="top" width="29%"> + <div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div> + </td> + <td width="1%"> </td> + <td width="60%"> + <div> + <#list paymentList as paymentMap> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + </#list> + </div> + </td> + </tr> + </#if> </#if> <#else> <tr> @@ -222,6 +238,21 @@ under the License. </#if> </td> </tr> + <#if paymentList?has_content> + <tr> + <td align="right" valign="top" width="29%"> + <div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div> + </td> + <td width="1%"> </td> + <td width="60%"> + <div> + <#list paymentList as paymentMap> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + </#list> + </div> + </td> + </tr> + </#if> </#if> <#else> <#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD"> @@ -345,6 +376,21 @@ under the License. </#if> </td> </tr> + <#if paymentList?has_content> + <tr> + <td align="right" valign="top" width="29%"> + <div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div> + </td> + <td width="1%"> </td> + <td width="60%"> + <div> + <#list paymentList as paymentMap> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + </#list> + </div> + </td> + </tr> + </#if> <#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD"> <#assign giftCard = paymentMethod.getRelatedOne("GiftCard")> <#if giftCard?exists> @@ -389,6 +435,21 @@ under the License. </#if> </td> </tr> + <#if paymentList?has_content> + <tr> + <td align="right" valign="top" width="29%"> + <div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div> + </td> + <td width="1%"> </td> + <td width="60%"> + <div> + <#list paymentList as paymentMap> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + </#list> + </div> + </td> + </tr> + </#if> </#if> </#if> <#if pmBillingAddress?has_content> @@ -409,6 +470,21 @@ under the License. </td> <td width="10%"> </td> </tr> + <#if paymentList?has_content> + <tr> + <td align="right" valign="top" width="29%"> + <div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div> + </td> + <td width="1%"> </td> + <td width="60%"> + <div> + <#list paymentList as paymentMap> + <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if> + </#list> + </div> + </td> + </tr> + </#if> </#if> </#list> Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Fri Apr 8 08:07:00 2011 @@ -8873,7 +8873,7 @@ <value xml:lang="de">Postadresse erfolgreich erstellt.</value> <value xml:lang="en">Postal Address successfully created.</value> <value xml:lang="es">Direccion postal creada con éxito.</value> - <value xml:lang="fr">Adresse postale créé.</value> + <value xml:lang="fr">Adresse postale créée.</value> <value xml:lang="hi_IN">डाठपता सफलतापà¥à¤°à¥à¤µà¤ बन à¤à¤¯à¤¾ हà¥|</value> <value xml:lang="it">Indirizzo postale creato.</value> <value xml:lang="nl">Postadres succesvol aangemaakt.</value> @@ -8887,7 +8887,7 @@ <value xml:lang="de">Postadresse erfolgreich aktualisisert.</value> <value xml:lang="en">Postal Address successfully updated.</value> <value xml:lang="es">Dirección postal actualizada con éxito.</value> - <value xml:lang="fr">Adresse postale mis à jour</value> + <value xml:lang="fr">Adresse postale mise à jour</value> <value xml:lang="hi_IN">डाठपता सफलतापà¥à¤°à¥à¤µà¤ नवà¥à¤¨à¥à¤à¥à¤¤ हॠà¤à¤¯à¤¾ हà¥|</value> <value xml:lang="it">Indirizzo postale creato.</value> <value xml:lang="nl">Postadres succesvol aangepast.</value> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |