svn commit: r804935 [1/4] - in /ofbiz/trunk: applications/accounting/ applications/accounting/src/or
Locked
svn commit: r804935 [1/4] - in /ofbiz/trunk: applications/accounting/ applications/accounting/src/or
 
|
Author: jleroux
Date: Mon Aug 17 11:01:25 2009 New Revision: 804935 URL: http://svn.apache.org/viewvc?rev=804935&view=rev Log: no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml) Modified: ofbiz/trunk/applications/accounting/build.xml ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl ofbiz/trunk/applications/content/webapp/content/content/nav.ftl ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl ofbiz/trunk/applications/securityext/build.xml ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilDateTime.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/trunk/framework/bi/webapp/bi/main.ftl ofbiz/trunk/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl ofbiz/trunk/framework/bi/widget/BiScreens.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/entity/config/entityengine.xml ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java ofbiz/trunk/framework/example/webapp/appheader.ftl ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/resources/templates/build.xml ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java ofbiz/trunk/framework/testtools/build.xml ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/example_login.xml ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/example_testsuite.xml ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java ofbiz/trunk/specialpurpose/ecommerce/templates/email/emailpayretry.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl ofbiz/trunk/themes/multiflex/includes/header.ftl Modified: ofbiz/trunk/applications/accounting/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/build.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/build.xml (original) +++ ofbiz/trunk/applications/accounting/build.xml Mon Aug 17 11:01:25 2009 @@ -60,7 +60,7 @@ <!-- exclude the payment processor packages; comment this out to not exclude if you have libs --> <exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/> <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/> - <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/> + <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/> </javac15> </target> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Mon Aug 17 11:01:25 2009 @@ -157,31 +157,31 @@ GenericValue productStore = null; // Check value productStore *** New if (productStoreId!=null) { - try { - getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); - if (productStoreId != null) { - productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); - } - - } catch (GenericEntityException e) { - String errMsg = "Data error getting tax settings: " + e.toString(); - Debug.logError(e, errMsg, module); - return ServiceUtil.returnError(errMsg); - } - - if (productStore == null && payToPartyId == null) { - throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation"); - } + try { + getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); + if (productStoreId != null) { + productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); + } + + } catch (GenericEntityException e) { + String errMsg = "Data error getting tax settings: " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + + if (productStore == null && payToPartyId == null) { + throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation"); + } } else { - try { - getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); - } catch (GenericEntityException e) { - String errMsg = "Data error getting tax settings: " + e.toString(); - Debug.logError(e, errMsg, module); - return ServiceUtil.returnError(errMsg); - } + try { + getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); + } catch (GenericEntityException e) { + String errMsg = "Data error getting tax settings: " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } } // Setup the return lists. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl Mon Aug 17 11:01:25 2009 @@ -23,13 +23,13 @@ <#if PayrolGroup?has_content> <#list PayrolGroup as payrolGroup> <tr class="header-row" > - <td> - [${payrolGroup.description}] - </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> + <td> + [${payrolGroup.description}] + </td> + <td> </td> + <td> </td> + <td> </td> + <td> </td> </tr> <tr class="header-row"> @@ -39,21 +39,21 @@ <td> </td> <td> </td> </tr> - <#if PayrolList?has_content> - <#list PayrolList as payrolList> - <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> + <#if PayrolList?has_content> + <#list PayrolList as payrolList> + <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> <tr> - <td align="right"> - ${payrolList.description} : - </td> - <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Quantity"/></td> - <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Amount"/></td> - <td> </td> - <td> </td> + <td align="right"> + ${payrolList.description} : + </td> + <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Quantity"/></td> + <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Amount"/></td> + <td> </td> + <td> </td> </tr> - </#if> - </#list> - </#if> + </#if> + </#list> + </#if> </#list> </#if> <tr class="header-row"> @@ -64,11 +64,11 @@ <td> </td> </tr> <tr > - <td align="right"><b>Add all values : </b></td> - <td align="center" ><input type="submit" value="Add"></td> - <td> </td> - <td> </td> - <td> </td> + <td align="right"><b>Add all values : </b></td> + <td align="center" ><input type="submit" value="Add"></td> + <td> </td> + <td> </td> + <td> </td> </tr> </table> </form> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Mon Aug 17 11:01:25 2009 @@ -174,28 +174,28 @@ <#assign InvoiceItems = invoice.getRelated("InvoiceItem")?if_exists> <#assign PayrolGroups = PayrolGroup?if_exists> <#list PayrolGroups as payrolGroup> - <#assign fontSize = "75%"> - <#assign lineStyle = "dashed"> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> - <#assign sumQuantity = 0> - <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign quantity = 0> - <#assign amount = 0> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> @@ -208,25 +208,25 @@ <fo:block font-weight="bold" text-align="center">Amount</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > - <fo:block font-weight="bold" text-align="center">Sum</fo:block> - </fo:table-cell> + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> </fo:table-row> </#if> <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> @@ -234,26 +234,26 @@ <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> </fo:table-row> - </#if> - </#list> + </#if> + </#list> - <#assign sumQuantity = 0> + <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> @@ -264,7 +264,7 @@ <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> </fo:table-row> - </#if> + </#if> </#list> <fo:table-row font-size="${fontSize}"> @@ -370,28 +370,28 @@ <#assign InvoiceItems = invoice.getRelated("InvoiceItem")?if_exists> <#assign PayrolGroups = PayrolGroup?if_exists> <#list PayrolGroups as payrolGroup> - <#assign fontSize = "75%"> - <#assign lineStyle = "dashed"> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> - <#assign sumQuantity = 0> - <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign quantity = 0> - <#assign amount = 0> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> @@ -404,25 +404,25 @@ <fo:block font-weight="bold" text-align="center">Amount</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > - <fo:block font-weight="bold" text-align="center">Sum</fo:block> - </fo:table-cell> + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> </fo:table-row> </#if> <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> @@ -430,26 +430,26 @@ <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> </fo:table-row> - </#if> - </#list> + </#if> + </#list> - <#assign sumQuantity = 0> + <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> @@ -460,7 +460,7 @@ <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> </fo:table-row> - </#if> + </#if> </#list> <fo:table-row font-size="${fontSize}"> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl Mon Aug 17 11:01:25 2009 @@ -34,14 +34,14 @@ <div>NOTE: each set of numbers is: <quantity>:<total amount>:<average amount></div> <table class="basic-table" cellspacing="0"> <#-- Create the header row --> - <tr class="header-row"> - <td>Day</td> - <td>[No Product]</td> + <tr class="header-row"> + <td>Day</td> + <td>[No Product]</td> <#list productList as product> - <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</td> + <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</td> </#list> <#list productCategoryList as productCategory> - <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</td> + <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</td> </#list> </tr> <#-- Days of the month --> @@ -49,32 +49,32 @@ <#assign productResultMap = productResultMapByDayList.get(productNullResult_index)/> <#assign categoryResultMap = categoryResultMapByDayList.get(productNullResult_index)/> - <#-- now do the null product, then iterate through the products, then categories --> - <tr> - <td class="label">${(productNullResult_index + 1)}</td> - <td><@resultSummary resultMap=productNullResult/></td> + <#-- now do the null product, then iterate through the products, then categories --> + <tr> + <td class="label">${(productNullResult_index + 1)}</td> + <td><@resultSummary resultMap=productNullResult/></td> <#list productList as product> <#assign productResult = productResultMap[product.productId]?if_exists/> - <td><@resultSummary resultMap=productResult/></td> + <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]?if_exists/> - <td><@resultSummary resultMap=categoryResult/></td> + <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> </#list> <#-- Totals for the month --> - <tr> - <td class="label">Month Total</td> - <td><@resultSummary resultMap=monthProductNullResult/></td> + <tr> + <td class="label">Month Total</td> + <td><@resultSummary resultMap=monthProductNullResult/></td> <#list productList as product> <#assign productResult = monthProductResultMap[product.productId]?if_exists/> - <td><@resultSummary resultMap=productResult/></td> + <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]?if_exists/> - <td><@resultSummary resultMap=categoryResult/></td> + <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> </table> Modified: ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl (original) +++ ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl Mon Aug 17 11:01:25 2009 @@ -17,15 +17,15 @@ under the License. --> <object type="application/x-shockwave-flash" data="/images/FlowPlayerLP.swf" width="320" height="263" id="FlowPlayer"> - <param name="movie" value="/images/FlowPlayerLP.swf" /> - <param name="quality" value="high" /> + <param name="movie" value="/images/FlowPlayerLP.swf" /> + <param name="quality" value="high" /> - <param name="flashvars" value="config={ - autoPlay: true, - bufferLength: '100', - loop: false, - initialScale: 'fit', - videoFile: '/content/control/stream?contentId=${contentId}', - showPlayListButtons: true - }" /> + <param name="flashvars" value="config={ + autoPlay: true, + bufferLength: '100', + loop: false, + initialScale: 'fit', + videoFile: '/content/control/stream?contentId=${contentId}', + showPlayListButtons: true + }" /> </object> \ No newline at end of file Modified: ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl (original) +++ ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl Mon Aug 17 11:01:25 2009 @@ -18,5 +18,5 @@ --> <object width="550" height="400"> <param name="movie" value="/content/control/stream?contentId=${contentId}"> - <embed src="/content/control/stream?contentId=${contentId}" width="550" height="400"></embed> + <embed src="/content/control/stream?contentId=${contentId}" width="550" height="400"></embed> </object> Modified: ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl (original) +++ ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl Mon Aug 17 11:01:25 2009 @@ -26,6 +26,6 @@ <param name="KIOSKMODE" value="false" /> <embed src="/content/control/stream?contentId=${contentId}" width="320" height="263" scale="tofit" autostart="true" autoplay="true" kioskmode="false" target="quicktimeplayer" - pluginspage="http://www.apple.com/quicktime/download/"> + pluginspage="http://www.apple.com/quicktime/download/"> </embed> </object> Modified: ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl Mon Aug 17 11:01:25 2009 @@ -255,9 +255,9 @@ <#-- special formatting for select boxes --> <#assign align = "left"/> <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> - <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")> - <#assign align = "right"/> - </#if> + <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")> + <#assign align = "right"/> + </#if> </#if> <#-- get an answer from the answerMap --> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Mon Aug 17 11:01:25 2009 @@ -18,9 +18,9 @@ --> <SCRIPT language="javascript"> function call_fieldlookup4(rootForumId, parentForumId ) { - var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); - obj_lookupwindow.opener = window; - obj_lookupwindow.focus(); + var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); + obj_lookupwindow.opener = window; + obj_lookupwindow.focus(); } </script> @@ -265,9 +265,9 @@ <SCRIPT language="javascript"> function call_fieldlookup3(view_name) { window.target = document.siteRoleForm.partyId_o_${rowCount - 1}; - var obj_lookupwindow = window.open(view_name,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); - obj_lookupwindow.opener = window; - obj_lookupwindow.focus(); + var obj_lookupwindow = window.open(view_name,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); + obj_lookupwindow.opener = window; + obj_lookupwindow.focus(); } </script> Modified: ofbiz/trunk/applications/content/webapp/content/content/nav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/nav.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/nav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/nav.ftl Mon Aug 17 11:01:25 2009 @@ -58,8 +58,8 @@ <style> .dojoContextMenu { - background-color: #ccc; - font-size: 10px; + background-color: #ccc; + font-size: 10px; } </style> Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl Mon Aug 17 11:01:25 2009 @@ -18,9 +18,9 @@ --> <script language="javascript1.2"> function call_fieldlookup3(view_name) { - var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" + webSitePublishPoint,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); - obj_lookupwindow.opener = window; - obj_lookupwindow.focus(); + var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" + webSitePublishPoint,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); + obj_lookupwindow.opener = window; + obj_lookupwindow.focus(); } function submitRows(rowCount) { var rowCountElement = document.createElement("input"); Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon Aug 17 11:01:25 2009 @@ -1838,7 +1838,7 @@ <property key="PageTitleFindRelocationDetails"> <value xml:lang="en">Find Relocation Details</value> </property> - <property key="HumanResPreRequisiteSkill"> + <property key="HumanResPreRequisiteSkill"> <value xml:lang="en">Pre Requisite Skill</value> </property> <property key="HumanResTrainingApprovals"> Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Mon Aug 17 11:01:25 2009 @@ -2224,34 +2224,34 @@ // check if a bom exists List bomList = null; try { - bomList = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productId", componentProductId, "productAssocTypeId", "MANUF_COMPONENT")); - bomList = EntityUtil.filterByDate(bomList, UtilDateTime.nowTimestamp()); + bomList = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productId", componentProductId, "productAssocTypeId", "MANUF_COMPONENT")); + bomList = EntityUtil.filterByDate(bomList, UtilDateTime.nowTimestamp()); } catch (GenericEntityException e) { - return ServiceUtil.returnError("try to get BOM list from productAssoc"); + return ServiceUtil.returnError("try to get BOM list from productAssoc"); } // if so create a mandatory predecessor to this production run if (UtilValidate.isNotEmpty(bomList)) { - serviceContext.clear(); - serviceContext.put("productId", componentProductId); - serviceContext.put("quantity", componentQuantity); - serviceContext.put("startDate", UtilDateTime.nowTimestamp()); - serviceContext.put("facilityId", facilityId); - serviceContext.put("userLogin", userLogin); - resultService = null; - try { - resultService = dispatcher.runSync("createProductionRunsForProductBom", serviceContext); - GenericValue workEffortPreDecessor = delegator.makeValue("WorkEffortAssoc", UtilMisc.toMap( - "workEffortIdTo", productionRunId, "workEffortIdFrom", resultService.get("productionRunId"), - "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY", "fromDate", UtilDateTime.nowTimestamp())); - workEffortPreDecessor.create(); - } catch (GenericServiceException e) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunNotCreated", locale)); - } catch (GenericEntityException e) { - return ServiceUtil.returnError("try to create workeffort assoc"); - } - + serviceContext.clear(); + serviceContext.put("productId", componentProductId); + serviceContext.put("quantity", componentQuantity); + serviceContext.put("startDate", UtilDateTime.nowTimestamp()); + serviceContext.put("facilityId", facilityId); + serviceContext.put("userLogin", userLogin); + resultService = null; + try { + resultService = dispatcher.runSync("createProductionRunsForProductBom", serviceContext); + GenericValue workEffortPreDecessor = delegator.makeValue("WorkEffortAssoc", UtilMisc.toMap( + "workEffortIdTo", productionRunId, "workEffortIdFrom", resultService.get("productionRunId"), + "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY", "fromDate", UtilDateTime.nowTimestamp())); + workEffortPreDecessor.create(); + } catch (GenericServiceException e) { + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunNotCreated", locale)); + } catch (GenericEntityException e) { + return ServiceUtil.returnError("try to create workeffort assoc"); + } + } else { - components.put(componentProductId, componentQuantity); + components.put(componentProductId, componentQuantity); } // create production run notes from comments Modified: ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl (original) +++ ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl Mon Aug 17 11:01:25 2009 @@ -75,7 +75,7 @@ </tr> <tr> <td colspan="2' align="center"> - <a href="${baseUrl}/ordermgr/control/orderview?orderId=${orderId}">View Order #${orderId}</a> + <a href="${baseUrl}/ordermgr/control/orderview?orderId=${orderId}">View Order #${orderId}</a> </td> </tr> </table> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Mon Aug 17 11:01:25 2009 @@ -909,7 +909,7 @@ <set field="createOrderMap.returnTypeId" value="RTN_WAIT_REPLACE_RES"/> <call-service service-name="processReplacementReturn" in-map-name="createOrderMap"/> </if-compare> - </if-not-empty> + </if-not-empty> </if-not-empty> </if-compare> </simple-method> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Aug 17 11:01:25 2009 @@ -1020,9 +1020,9 @@ </entity-and> <first-from-list entry="pcmp" list="pcmpList"/> <if-not-empty field="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> - <clear-field field="serviceInMap"/> + <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <clear-field field="serviceInMap"/> </if-not-empty> <if-compare field="keepAddressBook" operator="equals" value="N"> <set field="serviceInMap.contactMechId" from-field="parameters.billToContactMechId"/> @@ -1036,10 +1036,10 @@ <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <if-empty field="pcmpList"> - <set field="billToAddressCtx.contactMechPurposeTypeId" value="BILLING_LOCATION"/> - <set-service-fields service-name="createPartyContactMechPurpose" map="billToAddressCtx" to-map="serviceInMap"/> - <set field="serviceInMap.contactMechId" from-field="parameters.shipToContactMechId"/> - <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceInMap"/> + <set field="billToAddressCtx.contactMechPurposeTypeId" value="BILLING_LOCATION"/> + <set-service-fields service-name="createPartyContactMechPurpose" map="billToAddressCtx" to-map="serviceInMap"/> + <set field="serviceInMap.contactMechId" from-field="parameters.shipToContactMechId"/> + <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceInMap"/> </if-empty> <log level="info" message="Billing address updated with contactMechId ${parameters.billToContactMechId}"/> </if-compare-field> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Mon Aug 17 11:01:25 2009 @@ -50,7 +50,7 @@ <check-errors/> <entity-one entity-name="OrderAdjustment" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> - + <if-not-empty field="parameters.productPromoCodeId"> <entity-one entity-name="OrderProductPromoCode" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl Mon Aug 17 11:01:25 2009 @@ -46,5 +46,5 @@ </#if> </#list> </ul> - <br class="clear" /> + <br class="clear" /> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Mon Aug 17 11:01:25 2009 @@ -236,25 +236,25 @@ } <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> - function checkRadioButton() { - var block1 = document.getElementById("addCart1"); - var block2 = document.getElementById("addCart2"); - <#list featureLists as featureList> - <#list featureList as feature> - <#if feature_index == 0> - var myList = document.getElementById("FT${feature.productFeatureTypeId}"); - if (myList.options[0].selected == true){ - block1.style.display = "none"; - block2.style.display = "block"; - return; - } - <#break> - </#if> - </#list> - </#list> - block1.style.display = "block"; - block2.style.display = "none"; - } + function checkRadioButton() { + var block1 = document.getElementById("addCart1"); + var block2 = document.getElementById("addCart2"); + <#list featureLists as featureList> + <#list featureList as feature> + <#if feature_index == 0> + var myList = document.getElementById("FT${feature.productFeatureTypeId}"); + if (myList.options[0].selected == true){ + block1.style.display = "none"; + block2.style.display = "block"; + return; + } + <#break> + </#if> + </#list> + </#list> + block1.style.display = "block"; + block2.style.display = "none"; + } </#if> //--> </script> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Mon Aug 17 11:01:25 2009 @@ -36,7 +36,7 @@ <tr> <td align="right"> <input type="radio" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if>> - </td> + </td> <td> <div>${uiLabelMap.CommonPerson}</div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Mon Aug 17 11:01:25 2009 @@ -79,13 +79,13 @@ <tr> <td class="label">${uiLabelMap.OrderShipGroup}</td> <td><select name="shipGroupSeqId"> - <#list shipGroups as shipGroup> - <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option> - </#list> - </select> - </td> + <#list shipGroups as shipGroup> + <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option> + </#list> + </select> + </td> </tr> - </#if> + </#if> <tr> <td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td> <td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Mon Aug 17 11:01:25 2009 @@ -195,12 +195,12 @@ <#-- now update/cancel reason and comment field --> <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo?if_exists)> <tr><td colspan="8"><span class="label">${uiLabelMap.OrderReturnReason}</span> - <select name="irm_${orderItem.orderItemSeqId}"> - <option value=""> </option> - <#list orderItemChangeReasons as reason> - <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option> - </#list> - </select> + <select name="irm_${orderItem.orderItemSeqId}"> + <option value=""> </option> + <#list orderItemChangeReasons as reason> + <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option> + </#list> + </select> <span class="label">${uiLabelMap.CommonComments}</span> <input type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/> <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Mon Aug 17 11:01:25 2009 @@ -47,13 +47,13 @@ <td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> + <OPTION VALUE="orderStatus"></OPTION> + <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> + <OPTION VALUE="ship">Orders by Ship Method</OPTION> + <OPTION VALUE="payment">Orders by Payment Method</OPTION> + <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> + <OPTION VALUE="itemStatus">Order Items by Status</OPTION> + <OPTION VALUE="product">Order Items by Product</OPTION> </SELECT> </td> </tr> @@ -85,13 +85,13 @@ <td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> + <OPTION VALUE="orderStatus"></OPTION> + <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> + <OPTION VALUE="ship">Orders by Ship Method</OPTION> + <OPTION VALUE="payment">Orders by Payment Method</OPTION> + <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> + <OPTION VALUE="itemStatus">Order Items by Status</OPTION> + <OPTION VALUE="product">Order Items by Product</OPTION> </SELECT> </td> </tr> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Mon Aug 17 11:01:25 2009 @@ -128,10 +128,10 @@ boolean isMultiPart = false; List <GenericValue> comEventContents = communicationEvent.getRelated("CommEventContentAssoc"); if (UtilValidate.isNotEmpty(comEventContents)) { - isMultiPart = true; + isMultiPart = true; List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); if (UtilValidate.isNotEmpty(communicationEvent.getString("content"))) { - bodyParts.add(UtilMisc.<String, Object>toMap("content", communicationEvent.getString("content"), "type", communicationEvent.getString("contentMimeTypeId"))); + bodyParts.add(UtilMisc.<String, Object>toMap("content", communicationEvent.getString("content"), "type", communicationEvent.getString("contentMimeTypeId"))); } for (GenericValue comEventContent : comEventContents) { GenericValue content = comEventContent.getRelatedOne("FromContent"); @@ -139,7 +139,7 @@ ByteBuffer dataContent = DataResourceWorker.getContentAsByteBuffer(delegator, dataResource.getString("dataResourceId"), null, null, locale, null); bodyParts.add(UtilMisc.<String, Object>toMap("content", dataContent.array(), "type", dataResource.getString("mimeTypeId"), "filename", dataResource.getString("dataResourceName"))); } - sendMailParams.put("bodyParts", bodyParts); + sendMailParams.put("bodyParts", bodyParts); } else { sendMailParams.put("body", communicationEvent.getString("content")); } @@ -165,29 +165,29 @@ String sendBcc = null; List <GenericValue> commRoles = communicationEvent.getRelated("CommunicationEventRole"); if (UtilValidate.isNotEmpty(commRoles)) { - for (GenericValue commRole : commRoles) { // 'from' and 'to' already defined on communication event - if (commRole.getString("partyId").equals(communicationEvent.getString("partyIdFrom")) || commRole.getString("partyId").equals(communicationEvent.getString("partyIdTo"))) { - continue; - } - GenericValue contactMech = commRole.getRelatedOne("ContactMech"); - if (UtilValidate.isNotEmpty(contactMech) && UtilValidate.isNotEmpty(contactMech.getString("infoString"))) { - if ("ADDRESSEE".equals(commRole.getString("roleTypeId"))) { - sendTo += "," + contactMech.getString("infoString"); - } else if ("CC".equals(commRole.getString("roleTypeId"))) { - if (sendCc != null) { - sendCc += "," + contactMech.getString("infoString"); - } else { - sendCc = contactMech.getString("infoString"); - } - } else if ("BCC".equals(commRole.getString("roleTypeId"))) { - if (sendBcc != null) { - sendBcc += "," + contactMech.getString("infoString"); - } else { - sendBcc = contactMech.getString("infoString"); - } - } - } - } + for (GenericValue commRole : commRoles) { // 'from' and 'to' already defined on communication event + if (commRole.getString("partyId").equals(communicationEvent.getString("partyIdFrom")) || commRole.getString("partyId").equals(communicationEvent.getString("partyIdTo"))) { + continue; + } + GenericValue contactMech = commRole.getRelatedOne("ContactMech"); + if (UtilValidate.isNotEmpty(contactMech) && UtilValidate.isNotEmpty(contactMech.getString("infoString"))) { + if ("ADDRESSEE".equals(commRole.getString("roleTypeId"))) { + sendTo += "," + contactMech.getString("infoString"); + } else if ("CC".equals(commRole.getString("roleTypeId"))) { + if (sendCc != null) { + sendCc += "," + contactMech.getString("infoString"); + } else { + sendCc = contactMech.getString("infoString"); + } + } else if ("BCC".equals(commRole.getString("roleTypeId"))) { + if (sendBcc != null) { + sendBcc += "," + contactMech.getString("infoString"); + } else { + sendBcc = contactMech.getString("infoString"); + } + } + } + } } sendMailParams.put("communicationEventId", communicationEventId); @@ -770,17 +770,17 @@ // select the plain text bodypart String messageBody = null; if (wrapper.getMainPartCount() > 1) { - for (int ind=0; ind < wrapper.getMainPartCount(); ind++) { - BodyPart p = wrapper.getPart(ind + ""); - if (p.getContentType().toLowerCase().indexOf("text/plain") > -1) { - messageBody = (String) p.getContent(); - break; - } - } + for (int ind=0; ind < wrapper.getMainPartCount(); ind++) { + BodyPart p = wrapper.getPart(ind + ""); + if (p.getContentType().toLowerCase().indexOf("text/plain") > -1) { + messageBody = (String) p.getContent(); + break; + } + } } if (messageBody == null) { - messageBody = wrapper.getMessageBody(); + messageBody = wrapper.getMessageBody(); } commEventMap.put("content", messageBody); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Mon Aug 17 11:01:25 2009 @@ -212,38 +212,38 @@ GenericValue party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)); if (party.get("statusId") == null) { // old records - party.set("statusId", "PARTY_ENABLED"); + party.set("statusId", "PARTY_ENABLED"); } - String oldStatusId = party.getString("statusId"); + String oldStatusId = party.getString("statusId"); if (!party.getString("statusId").equals(statusId)) { - // check that status is defined as a valid change - GenericValue statusValidChange = delegator.findByPrimaryKey("StatusValidChange", UtilMisc.toMap("statusId", party.getString("statusId"), "statusIdTo", statusId)); - if (statusValidChange == null) { - String errorMsg = "Cannot change party status from " + party.getString("statusId") + " to " + statusId; - Debug.logWarning(errorMsg, module); - return ServiceUtil.returnError(errorMsg); - } - - party.set("statusId", statusId); - party.store(); - - // record this status change in PartyStatus table - GenericValue partyStatus = delegator.makeValue("PartyStatus", UtilMisc.toMap("partyId", partyId, "statusId", statusId, "statusDate", statusDate)); - partyStatus.create(); - - // disable all userlogins for this user when the new status is disabled - if (("PARTY_DISABLED").equals(statusId)) { - List <GenericValue> userLogins = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId)); - for(GenericValue userLogin : userLogins) { - if (!"N".equals(userLogin.getString("enabled"))) { - userLogin.set("enabled", "N"); - userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp()); - userLogin.store(); - } - } - } + // check that status is defined as a valid change + GenericValue statusValidChange = delegator.findByPrimaryKey("StatusValidChange", UtilMisc.toMap("statusId", party.getString("statusId"), "statusIdTo", statusId)); + if (statusValidChange == null) { + String errorMsg = "Cannot change party status from " + party.getString("statusId") + " to " + statusId; + Debug.logWarning(errorMsg, module); + return ServiceUtil.returnError(errorMsg); + } + + party.set("statusId", statusId); + party.store(); + + // record this status change in PartyStatus table + GenericValue partyStatus = delegator.makeValue("PartyStatus", UtilMisc.toMap("partyId", partyId, "statusId", statusId, "statusDate", statusDate)); + partyStatus.create(); + + // disable all userlogins for this user when the new status is disabled + if (("PARTY_DISABLED").equals(statusId)) { + List <GenericValue> userLogins = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId)); + for(GenericValue userLogin : userLogins) { + if (!"N".equals(userLogin.getString("enabled"))) { + userLogin.set("enabled", "N"); + userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp()); + userLogin.store(); + } + } + } } Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -290,7 +290,7 @@ // update status by separate service String oldStatusId = party.getString("statusId"); if (party.get("statusId") == null) { // old records - party.set("statusId", "PARTY_ENABLED"); + party.set("statusId", "PARTY_ENABLED"); } person.setNonPKFields(context); Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Aug 17 11:01:25 2009 @@ -585,20 +585,20 @@ <key-map field-name="configItemId"/> </relation> </entity> - <view-entity entity-name="ProductConfigAndProduct" - package-name="org.ofbiz.product.config" - title="Product Config And Product View Entity, to be able to see which products use a certain configuration item"> - <member-entity entity-alias="PDC" entity-name="ProductConfig"/> - <member-entity entity-alias="PD" entity-name="Product"/> - <alias-all entity-alias="PDC"> - <exclude field="description"/> - <exclude field="longDescription"/> - </alias-all> - <alias-all entity-alias="PD"/> - <view-link entity-alias="PDC" rel-entity-alias="PD"> - <key-map field-name="productId"/> - </view-link> - </view-entity> + <view-entity entity-name="ProductConfigAndProduct" + package-name="org.ofbiz.product.config" + title="Product Config And Product View Entity, to be able to see which products use a certain configuration item"> + <member-entity entity-alias="PDC" entity-name="ProductConfig"/> + <member-entity entity-alias="PD" entity-name="Product"/> + <alias-all entity-alias="PDC"> + <exclude field="description"/> + <exclude field="longDescription"/> + </alias-all> + <alias-all entity-alias="PD"/> + <view-link entity-alias="PDC" rel-entity-alias="PD"> + <key-map field-name="productId"/> + </view-link> + </view-entity> <entity entity-name="ProductConfigItem" package-name="org.ofbiz.product.config" title="Product Configuration Question Entity"> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Mon Aug 17 11:01:25 2009 @@ -2651,7 +2651,7 @@ Document acceptAccessRequestDocument = createAccessRequestDocument(); String acceptAccessRequestString = null; try { - acceptAccessRequestString = UtilXml.writeXmlDocument(acceptAccessRequestDocument); + acceptAccessRequestString = UtilXml.writeXmlDocument(acceptAccessRequestDocument); } catch (IOException e) { String ioeErrMsg = "Error writing the AccessRequest XML Document to a String: " + e.toString(); Debug.logError(e, ioeErrMsg, module); Modified: ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl Mon Aug 17 11:01:25 2009 @@ -16,5 +16,5 @@ specific language governing permissions and limitations under the License. --><#list productExportList as productExportMap><#assign productCategoryCount=0/><#assign productFeatureCount=0/> -${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> +${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> </#list> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Mon Aug 17 11:01:25 2009 @@ -60,9 +60,9 @@ <#assign party = postedUserLogin.getRelatedOne("Party")> <#assign partyTypeId = party.get("partyTypeId")> <#if partyTypeId == "PERSON"> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person")> + <#assign postedPerson = postedUserLogin.getRelatedOne("Person")> <#else> - <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup")> + <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup")> </#if> <tr id="review_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> @@ -70,9 +70,9 @@ ${review.postedDateTime?if_exists} </td> <#if postedPerson.firstName?has_content && postedPerson.lastName?has_content> - <td>${postedPerson.firstName} ${postedPerson.lastName}</td> + <td>${postedPerson.firstName} ${postedPerson.lastName}</td> <#else> - <td>${postedPerson.groupName}</td> + <td>${postedPerson.groupName}</td> </#if> <td> <select name='postedAnonymous_o_${rowCount}'> Modified: ofbiz/trunk/applications/securityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/build.xml?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/build.xml (original) +++ ofbiz/trunk/applications/securityext/build.xml Mon Aug 17 11:01:25 2009 @@ -42,7 +42,7 @@ <fileset dir="../../framework/webapp/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../../framework/testtools/build/lib" includes="*.jar"/> + <fileset dir="../../framework/testtools/build/lib" includes="*.jar"/> <fileset dir="../party/build/lib" includes="*.jar"/> <fileset dir="../product/build/lib" includes="*.jar"/> <fileset dir="../order/build/lib" includes="*.jar"/> Modified: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy (original) +++ ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy Mon Aug 17 11:01:25 2009 @@ -24,9 +24,9 @@ partyAssign = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : parameters.workEffortId, "partyId" : parameters.userLogin.partyId])); if (partyAssign) { - if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { - context.isCalOwner = new Boolean(true); - } else{ + if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { + context.isCalOwner = new Boolean(true); + } else{ context.isCalOwner = new Boolean(false); - } + } } Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Aug 17 11:01:25 2009 @@ -113,10 +113,10 @@ List<GenericValue> toBeStored = FastList.newInstance(); for (Map.Entry<String, Long> entry: keywords.entrySet()) { - if (entry.getKey().length() < 60) { // ignore very long strings, cannot be stored anyway - GenericValue workEffortKeyword = delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId", workEffort.getString("workEffortId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); + if (entry.getKey().length() < 60) { // ignore very long strings, cannot be stored anyway + GenericValue workEffortKeyword = delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId", workEffort.getString("workEffortId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); toBeStored.add(workEffortKeyword); - } + } } if (toBeStored.size() > 0) { if (Debug.verboseOn()) Debug.logVerbose("WorkEffortKeywordIndex indexKeywords Storing " + toBeStored.size() + " keywords for workEffortId " + workEffort.getString("workEffortId"), module); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |