svn commit: r1618336 [1/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [1/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Author: ashish
Date: Sat Aug 16 11:34:57 2014 New Revision: 1618336 URL: http://svn.apache.org/r1618336 Log: Applied the patch OFBIZ-4902_application.patch from OFBIZ-4902 - Replace in Freemarker templates the deprecated built-ins: default, exists, if_exists. Thanks http://ofbiz.us team for providing the patch work. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl ofbiz/trunk/applications/content/template/email/servicenotification.ftl ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl ofbiz/trunk/applications/content/webapp/content/content/ContentSearchOptions.ftl ofbiz/trunk/applications/content/webapp/content/content/ContentSearchResults.ftl ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl ofbiz/trunk/applications/content/webapp/content/content/nav.ftl ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl ofbiz/trunk/applications/content/webapp/content/layout/renderSubContent.ftl ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/product.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl ofbiz/trunk/applications/party/templates/email/AccountActivatedNotification.ftl ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Notes.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl ofbiz/trunk/applications/product/webapp/catalog/find/miniproductlist.ftl ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl ofbiz/trunk/applications/product/webapp/catalog/main.ftl ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if agreement?exists> +<#if agreement??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl Sat Aug 16 11:34:57 2014 @@ -29,7 +29,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingCompanyNameCard}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/> + <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard!}"/> </td> </tr> <tr> @@ -49,21 +49,21 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingFirstNameCard}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/> <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> </tr> <tr> <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingMiddleNameCard}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> + <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingLastNameCard}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/> <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> </tr> <tr> @@ -88,7 +88,7 @@ under the License. <td width="5"> </td> <td width="74%"> <select name="cardType"> - <#if creditCard.cardType?exists> + <#if creditCard.cardType??> <option>${creditCard.cardType}</option> <option value="${creditCard.cardType}">---</option> </#if> @@ -104,7 +104,7 @@ under the License. <#if cardNumberMinDisplay?has_content> <#-- create a display version of the card where all but the last four digits are * --> <#assign cardNumberDisplay = ""> - <#assign cardNumber = creditCard.cardNumber?if_exists> + <#assign cardNumber = creditCard.cardNumber!> <#if cardNumber?has_content> <#assign size = cardNumber?length - 4> <#if (size > 0)> @@ -117,12 +117,12 @@ under the License. <#assign cardNumberDisplay = cardNumber> </#if> </#if> - <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}" /> + <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay!}" /> <#else> - <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber!}"/> </#if> <#else> - <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber!}"/> </#if> <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> </tr> @@ -130,7 +130,7 @@ under the License. <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardSecurityCode}</td> <td width="5"> </td> <td width="74%"> - <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}" /> + <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode!}" /> </td> </tr>--> <tr> @@ -139,9 +139,9 @@ under the License. <td width="74%"> <#assign expMonth = ""> <#assign expYear = ""> - <#if creditCard?exists && creditCard.expireDate?exists> + <#if creditCard?? && creditCard.expireDate??> <#assign expDate = creditCard.expireDate> - <#if (expDate?exists && expDate.indexOf("/") > 0)> + <#if (expDate?? && expDate.indexOf("/") > 0)> <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))> <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> </#if> @@ -150,10 +150,10 @@ under the License. <#if creditCard?has_content && expMonth?has_content> <#assign ccExprMonth = expMonth> <#else> - <#assign ccExprMonth = requestParameters.expMonth?if_exists> + <#assign ccExprMonth = requestParameters.expMonth!> </#if> <#if ccExprMonth?has_content> - <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> + <option value="${ccExprMonth!}">${ccExprMonth!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> @@ -161,10 +161,10 @@ under the License. <#if creditCard?has_content && expYear?has_content> <#assign ccExprYear = expYear> <#else> - <#assign ccExprYear = requestParameters.expYear?if_exists> + <#assign ccExprYear = requestParameters.expYear!> </#if> <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + <option value="${ccExprYear!}">${ccExprYear!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> @@ -174,7 +174,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonDescription}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/> + <input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description!}"/> </td> </tr> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Sat Aug 16 11:34:57 2014 @@ -80,35 +80,35 @@ function getFinAccountTransRunningTotalA </script> <div class="screenlet screenlet-body"> - <#if finAccountTransList?has_content && parameters.noConditionFind?exists && parameters.noConditionFind == 'Y'> - <#if !grandTotal?exists> + <#if finAccountTransList?has_content && parameters.noConditionFind?? && parameters.noConditionFind == 'Y'> + <#if !grandTotal??> <div> <span class="label">${uiLabelMap.AccountingRunningTotal} :</span> <span class="label" id="showFinAccountTransRunningTotal"></span> </div> </#if> - <form id="listFinAccTra" name="selectAllForm" method="post" action="<@ofbizUrl><#if !grandTotal?exists>reconcileFinAccountTrans?clearAll=Y<#else>assignGlRecToFinAccTrans?clearAll=Y</#if></@ofbizUrl>"> + <form id="listFinAccTra" name="selectAllForm" method="post" action="<@ofbizUrl><#if !grandTotal??>reconcileFinAccountTrans?clearAll=Y<#else>assignGlRecToFinAccTrans?clearAll=Y</#if></@ofbizUrl>"> <input name="_useRowSubmit" type="hidden" value="Y"/> <input name="finAccountId" type="hidden" value="${parameters.finAccountId}"/> - <input name="statusId" type="hidden" value="${parameters.statusId?if_exists}"/> - <#if !grandTotal?exists> - <input name="reconciledBalance" type="hidden" value="${(glReconciliation.reconciledBalance)?if_exists}"/> + <input name="statusId" type="hidden" value="${parameters.statusId!}"/> + <#if !grandTotal??> + <input name="reconciledBalance" type="hidden" value="${(glReconciliation.reconciledBalance)!}"/> <input name="reconciledBalanceWithUom" type="hidden" id="reconciledBalanceWithUom" value="<@ofbizCurrency amount=(glReconciliation.reconciledBalance)?default('0')/>"/> </#if> - <#assign glReconciliations = delegator.findByAnd("GlReconciliation", {"glAccountId" : finAccount.postToGlAccountId?if_exists, "statusId" : "GLREC_CREATED"}, Static["org.ofbiz.base.util.UtilMisc"].toList("reconciledDate DESC"), false)> - <#if (glReconciliationId?has_content && (glReconciliationId == "_NA_" && finAccountTransList?has_content)) || !grandTotal?exists> + <#assign glReconciliations = delegator.findByAnd("GlReconciliation", {"glAccountId" : finAccount.postToGlAccountId!, "statusId" : "GLREC_CREATED"}, Static["org.ofbiz.base.util.UtilMisc"].toList("reconciledDate DESC"), false)> + <#if (glReconciliationId?has_content && (glReconciliationId == "_NA_" && finAccountTransList?has_content)) || !grandTotal??> <div align="right"> - <#if grandTotal?exists> + <#if grandTotal??> <#if glReconciliations?has_content> <select name="glReconciliationId"> <option value="">--${uiLabelMap.CommonSelect}--</option> <#list glReconciliations as glReconciliation> - <option value="${glReconciliation.glReconciliationId}">${glReconciliation.glReconciliationName?if_exists}[[${glReconciliation.glReconciliationId}] [${glReconciliation.reconciledDate?if_exists}] [${glReconciliation.reconciledBalance?if_exists}]]</option> + <option value="${glReconciliation.glReconciliationId}">${glReconciliation.glReconciliationName!}[[${glReconciliation.glReconciliationId}] [${glReconciliation.reconciledDate!}] [${glReconciliation.reconciledBalance!}]]</option> </#list> </select> <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingAssignToReconciliation}" disabled="disabled" /> <#else> - <span class="tooltip">${uiLabelMap.AccountingNoGlReconciliationExists} <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${parameters.finAccountId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a></span> + <span class="tooltip">${uiLabelMap.AccountingNoGlReconciliatio??} <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${parameters.finAccountId!}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a></span> </#if> <#else> <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingReconcile}" disabled="disabled" /> @@ -130,15 +130,15 @@ function getFinAccountTransRunningTotalA <th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th> <th>${uiLabelMap.CommonStatus}</th> <th>${uiLabelMap.CommonComments}</th> - <#if grandTotal?exists> + <#if grandTotal??> <th>${uiLabelMap.AccountingCancelTransactionStatus}</th> </#if> - <#if !grandTotal?exists> + <#if !grandTotal??> <#if (parameters.glReconciliationId?has_content && parameters.glReconciliationId != "_NA_")> <th>${uiLabelMap.AccountingRemoveFromGlReconciliation}</th> </#if> </#if> - <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal?exists> + <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??> <th>${uiLabelMap.CommonSelectAll} <input name="selectAll" type="checkbox" value="N" id="checkAllTransactions" onclick="javascript:togglefinAccountTransId(this);"/></th> </#if> </tr> @@ -169,7 +169,7 @@ function getFinAccountTransRunningTotalA </#if> <#if finAccountTrans.glReconciliationId?has_content> <#assign glReconciliation = delegator.findOne("GlReconciliation", {"glReconciliationId" : finAccountTrans.glReconciliationId}, true)> - <input name="openingBalance_o_${finAccountTrans_index}" type="hidden" value="${glReconciliation.openingBalance?if_exists}"/> + <input name="openingBalance_o_${finAccountTrans_index}" type="hidden" value="${glReconciliation.openingBalance!}"/> </#if> <#if finAccountTrans.partyId?has_content> <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : finAccountTrans.partyId}, true))!> @@ -190,30 +190,30 @@ function getFinAccountTransRunningTotalA <th>${uiLabelMap.PartyPartyTo}</th> </tr> <#list payments as payment> - <#if payment?exists && payment.paymentTypeId?has_content> + <#if payment?? && payment.paymentTypeId?has_content> <#assign paymentType = delegator.findOne("PaymentType", {"paymentTypeId" : payment.paymentTypeId}, true)> </#if> <#if payment?has_content && payment.paymentMethodTypeId?has_content> <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, true)> </#if> <#if payment?has_content> - <#assign paymentGroupMembers = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(payment.getRelated("PaymentGroupMember", null, null, false)?if_exists) /> - <#assign fromParty = payment.getRelatedOne("FromParty", false)?if_exists /> + <#assign paymentGroupMembers = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(payment.getRelated("PaymentGroupMember", null, null, false)!) /> + <#assign fromParty = payment.getRelatedOne("FromParty", false)! /> <#assign fromPartyName = delegator.findOne("PartyNameView", {"partyId" : fromParty.partyId}, true) /> - <#assign toParty = payment.getRelatedOne("ToParty", false)?if_exists /> + <#assign toParty = payment.getRelatedOne("ToParty", false)! /> <#assign toPartyName = delegator.findOne("PartyNameView", {"partyId" : toParty.partyId}, true) /> <#if paymentGroupMembers?has_content> <#assign paymentGroupMember = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(paymentGroupMembers) /> </#if> </#if> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><#if paymentGroupMember?has_content><a href="<@ofbizUrl>EditDepositSlipAndMembers?paymentGroupId=${paymentGroupMember.paymentGroupId?if_exists}&finAccountId=${parameters.finAccountId?if_exists}</@ofbizUrl>">${paymentGroupMember.paymentGroupId?if_exists}</a></#if></td> - <td><#if payment?has_content><a href="<@ofbizUrl>paymentOverview?paymentId=${payment.paymentId?if_exists}</@ofbizUrl>">${payment.paymentId?if_exists}</a></#if></td> - <td><#if paymentType?has_content>${paymentType.description?if_exists}</#if></td> - <td><#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td> - <td><@ofbizCurrency amount=payment.amount?if_exists/></td> - <td><#if fromPartyName?has_content>${fromPartyName.groupName?if_exists}${fromPartyName.firstName?if_exists} ${fromPartyName.lastName?if_exists}<a href="/partymgr/control/viewprofile?partyId=${fromPartyName.partyId?if_exists}">[${fromPartyName.partyId?if_exists}]</a></#if></td> - <td><#if toPartyName?has_content>${toPartyName.groupName?if_exists}${toPartyName.firstName?if_exists} ${toPartyName.lastName?if_exists}<a href="/partymgr/control/viewprofile?partyId=${toPartyName.partyId?if_exists}">[${toPartyName.partyId?if_exists}]</a></#if></td> + <td><#if paymentGroupMember?has_content><a href="<@ofbizUrl>EditDepositSlipAndMembers?paymentGroupId=${paymentGroupMember.paymentGroupId!}&finAccountId=${parameters.finAccountId!}</@ofbizUrl>">${paymentGroupMember.paymentGroupId!}</a></#if></td> + <td><#if payment?has_content><a href="<@ofbizUrl>paymentOverview?paymentId=${payment.paymentId!}</@ofbizUrl>">${payment.paymentId!}</a></#if></td> + <td><#if paymentType?has_content>${paymentType.description!}</#if></td> + <td><#if paymentMethodType?has_content>${paymentMethodType.description!}</#if></td> + <td><@ofbizCurrency amount=payment.amount!/></td> + <td><#if fromPartyName?has_content>${fromPartyName.groupName!}${fromPartyName.firstName!} ${fromPartyName.lastName!}<a href="/partymgr/control/viewprofile?partyId=${fromPartyName.partyId!}">[${fromPartyName.partyId!}]</a></#if></td> + <td><#if toPartyName?has_content>${toPartyName.groupName!}${toPartyName.firstName!} ${toPartyName.lastName!}<a href="/partymgr/control/viewprofile?partyId=${toPartyName.partyId!}">[${toPartyName.partyId!}]</a></#if></td> </tr> </#list> </table> @@ -235,22 +235,22 @@ function getFinAccountTransRunningTotalA ${finAccountTrans.finAccountTransId} </#if> </td> - <td>${finAccountTransType.description?if_exists}</td> + <td>${finAccountTransType.description!}</td> <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td> - <td><#if glReconciliation?has_content>${glReconciliation.glReconciliationName?if_exists}<a href="ViewGlReconciliationWithTransaction?glReconciliationId=${glReconciliation.glReconciliationId?if_exists}&finAccountId=${parameters.finAccountId?if_exists}">[${glReconciliation.glReconciliationId?if_exists}]</a></#if></td> - <td>${finAccountTrans.transactionDate?if_exists}</td> - <td>${finAccountTrans.entryDate?if_exists}</td> - <td>${finAccountTrans.amount?if_exists}</td> + <td><#if glReconciliation?has_content>${glReconciliation.glReconciliationName!}<a href="ViewGlReconciliationWithTransaction?glReconciliationId=${glReconciliation.glReconciliationId!}&finAccountId=${parameters.finAccountId!}">[${glReconciliation.glReconciliationId!}]</a></#if></td> + <td>${finAccountTrans.transactionDate!}</td> + <td>${finAccountTrans.entryDate!}</td> + <td>${finAccountTrans.amount!}</td> <td> <#if finAccountTrans.paymentId?has_content> <a href="<@ofbizUrl>paymentOverview?paymentId=${finAccountTrans.paymentId}</@ofbizUrl>">${finAccountTrans.paymentId}</a> </#if> </td> - <td><#if paymentType?has_content>${paymentType.description?if_exists}</#if></td> - <td><#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td> - <td><#if status?has_content>${status.description?if_exists}</#if></td> - <td>${finAccountTrans.comments?if_exists}</td> - <#if grandTotal?exists> + <td><#if paymentType?has_content>${paymentType.description!}</#if></td> + <td><#if paymentMethodType?has_content>${paymentMethodType.description!}</#if></td> + <td><#if status?has_content>${status.description!}</#if></td> + <td>${finAccountTrans.comments!}</td> + <#if grandTotal??> <td> <#if finAccountTrans.statusId?has_content && finAccountTrans.statusId == 'FINACT_TRNS_CREATED'> <a href="javascript:document.cancelFinAccountTrans_${finAccountTrans.finAccountTransId}.submit();" class="buttontext">${uiLabelMap.CommonCancel}</a> @@ -262,14 +262,14 @@ function getFinAccountTransRunningTotalA <#if glReconciliationId?has_content && glReconciliationId != "_NA_"> <input name="glReconciliationId_o_${finAccountTrans_index}" type="hidden" value="${glReconciliationId}"/> </#if> - <#if !(grandTotal?exists)> + <#if !(grandTotal??)> <#if (parameters.glReconciliationId?has_content && parameters.glReconciliationId != "_NA_")> <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> <td><a href="javascript:document.removeFinAccountTransFromReconciliation_${finAccountTrans.finAccountTransId}.submit();" class="buttontext">${uiLabelMap.CommonRemove}</a></td> </#if> </#if> </#if> - <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal?exists> + <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??> <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> <td><input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="checkbox" value="Y" onclick="javascript:getFinAccountTransRunningTotalAndBalances();"/></td> </#if> @@ -286,7 +286,7 @@ function getFinAccountTransRunningTotalA <input name="finAccountId" type="hidden" value="${finAccountTrans.finAccountId}"/> </form> </#list> - <#if grandTotal?exists> + <#if grandTotal??> <#list finAccountTransList as finAccountTrans> <#if finAccountTrans.statusId?has_content && finAccountTrans.statusId == 'FINACT_TRNS_CREATED'> <form name="cancelFinAccountTrans_${finAccountTrans.finAccountTransId}" method="post" action="<@ofbizUrl>setFinAccountTransStatus</@ofbizUrl>"> @@ -326,8 +326,8 @@ function getFinAccountTransRunningTotalA </td> <td><@ofbizCurrency amount=glReconciliation.openingBalance?default('0')/></td> <td><@ofbizCurrency amount=glReconciliation.reconciledBalance?default('0')/></td> - <td id="endingBalance"><@ofbizCurrency amount=glReconciliationApprovedGrandTotal?if_exists/></td> - <input type="hidden" id="endingBalanceInput" value="<@ofbizCurrency amount=glReconciliationApprovedGrandTotal?if_exists/>"/> + <td id="endingBalance"><@ofbizCurrency amount=glReconciliationApprovedGrandTotal!/></td> + <input type="hidden" id="endingBalanceInput" value="<@ofbizCurrency amount=glReconciliationApprovedGrandTotal!/>"/> </tr> </table> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Sat Aug 16 11:34:57 2014 @@ -38,30 +38,30 @@ under the License. <table> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> - <td>${currentGlReconciliation.glReconciliationName?if_exists}</td> + <td>${currentGlReconciliation.glReconciliationName!}</td> </tr> - <#if currentGlReconciliation.statusId?exists> + <#if currentGlReconciliation.statusId??> <tr> <td><span class="label">${uiLabelMap.CommonStatus}</span></td> <#assign currentStatus = currentGlReconciliation.getRelatedOne("StatusItem", true)> - <td>${currentStatus.description?if_exists}</td> + <td>${currentStatus.description!}</td> </tr> </#if> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> - <td>${currentGlReconciliation.reconciledDate?if_exists}</td> + <td>${currentGlReconciliation.reconciledDate!}</td> </tr> <tr> <td><span class="label">${uiLabelMap.AccountingOpeningBalance}</span></td> <td><@ofbizCurrency amount=currentGlReconciliation.openingBalance?default('0')/></td> </tr> - <#if currentGlReconciliation.reconciledBalance?exists> + <#if currentGlReconciliation.reconciledBalance??> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> <td><@ofbizCurrency amount=currentGlReconciliation.reconciledBalance?default('0')/></td> </tr> </#if> - <#if currentClosingBalance?exists> + <#if currentClosingBalance??> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_closingBalance}</span></td> <td><@ofbizCurrency amount=currentClosingBalance/></td> @@ -83,30 +83,30 @@ under the License. <table> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> - <td>${previousGlReconciliation.glReconciliationName?if_exists}</td> + <td>${previousGlReconciliation.glReconciliationName!}</td> </tr> - <#if previousGlReconciliation.statusId?exists> + <#if previousGlReconciliation.statusId??> <tr> <td><span class="label">${uiLabelMap.CommonStatus}</span></td> <#assign previousStatus = previousGlReconciliation.getRelatedOne("StatusItem", true)> - <td>${previousStatus.description?if_exists}</td> + <td>${previousStatus.description!}</td> </tr> </#if> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> - <td>${previousGlReconciliation.reconciledDate?if_exists}</td> + <td>${previousGlReconciliation.reconciledDate!}</td> </tr> <tr> <td><span class="label">${uiLabelMap.AccountingOpeningBalance}</span></td> <td><@ofbizCurrency amount=previousGlReconciliation.openingBalance?default('0')/></td> </tr> - <#if previousGlReconciliation.reconciledBalance?exists> + <#if previousGlReconciliation.reconciledBalance??> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> <td><@ofbizCurrency amount=previousGlReconciliation.reconciledBalance?default('0')/></td> </tr> </#if> - <#if previousClosingBalance?exists> + <#if previousClosingBalance??> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_closingBalance}</span></td> <td><@ofbizCurrency amount=previousClosingBalance/></td> @@ -172,21 +172,21 @@ under the License. <input name="finAccountTransId_o_${finAccountTrans_index}" type="hidden" value="${finAccountTrans.finAccountTransId}"/> <input name="organizationPartyId_o_${finAccountTrans_index}" type="hidden" value="${defaultOrganizationPartyId}"/> <input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="hidden" value="Y"/> - ${finAccountTrans.finAccountTransId?if_exists}</td> - <td>${finAccountTransType.description?if_exists}</td> + ${finAccountTrans.finAccountTransId!}</td> + <td>${finAccountTransType.description!}</td> <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td> - <td>${finAccountTrans.transactionDate?if_exists}</td> - <td>${finAccountTrans.entryDateId?if_exists}</td> + <td>${finAccountTrans.transactionDate!}</td> + <td>${finAccountTrans.entryDateId!}</td> <td><@ofbizCurrency amount=finAccountTrans.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td> <#if finAccountTrans.paymentId?has_content> <a href="<@ofbizUrl>paymentOverview?paymentId=${finAccountTrans.paymentId}</@ofbizUrl>">${finAccountTrans.paymentId}</a> </#if> </td> - <td><#if paymentType?has_content>${paymentType.description?if_exists}</#if></td> - <td><#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td> - <td><#if status?has_content>${status.description?if_exists}</#if></td> - <td>${finAccountTrans.comments?if_exists}</td> + <td><#if paymentType?has_content>${paymentType.description!}</#if></td> + <td><#if paymentMethodType?has_content>${paymentMethodType.description!}</#if></td> + <td><#if status?has_content>${status.description!}</#if></td> + <td>${finAccountTrans.comments!}</td> <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> <td align="center"><a href="javascript:document.reomveFinAccountTransAssociation_${finAccountTrans.finAccountTransId}.submit();" class="buttontext">${uiLabelMap.CommonRemove}</a></td> <#else> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl Sat Aug 16 11:34:57 2014 @@ -48,66 +48,66 @@ under the License. </tr> <#list acctgTransAndEntries as acctgTransEntry> <tr> - <td>${acctgTransEntry.acctgTransId?if_exists}</td> - <td>${acctgTransEntry.acctgTransEntrySeqId?if_exists}</td> - <td>${acctgTransEntry.isPosted?if_exists}</td> + <td>${acctgTransEntry.acctgTransId!}</td> + <td>${acctgTransEntry.acctgTransEntrySeqId!}</td> + <td>${acctgTransEntry.isPosted!}</td> <td> <#if acctgTransEntry.glFiscalTypeId?has_content> <#assign glFiscalType = delegator.findOne("GlFiscalType", {"glFiscalTypeId" : acctgTransEntry.glFiscalTypeId}, false)/> - ${glFiscalType.description?if_exists} + ${glFiscalType.description!} </#if> </td> <td> <#if acctgTransEntry.acctgTransTypeId?has_content> <#assign acctgTransType = delegator.findOne("AcctgTransType", {"acctgTransTypeId" : acctgTransEntry.acctgTransTypeId}, false)/> - ${acctgTransType.description?if_exists} + ${acctgTransType.description!} </#if> </td> - <td>${acctgTransEntry.transactionDate?if_exists}</td> - <td>${acctgTransEntry.postedDate?if_exists}</td> - <td>${acctgTransEntry.glJournal?if_exists}</td> - <td>${acctgTransEntry.transTypeDescription?if_exists}</td> - <td>${acctgTransEntry.invoiceId?if_exists}</td> - <td>${acctgTransEntry.glAccountId?if_exists}</td> - <td>${acctgTransEntry.productId?if_exists}</td> - <td>${acctgTransEntry.debitCreditFlag?if_exists}</td> - <td>${acctgTransEntry.amount?if_exists}</td> - <td>${acctgTransEntry.origAmount?if_exists}</td> + <td>${acctgTransEntry.transactionDate!}</td> + <td>${acctgTransEntry.postedDate!}</td> + <td>${acctgTransEntry.glJournal!}</td> + <td>${acctgTransEntry.transTypeDescription!}</td> + <td>${acctgTransEntry.invoiceId!}</td> + <td>${acctgTransEntry.glAccountId!}</td> + <td>${acctgTransEntry.productId!}</td> + <td>${acctgTransEntry.debitCreditFlag!}</td> + <td>${acctgTransEntry.amount!}</td> + <td>${acctgTransEntry.origAmount!}</td> <td> <#if acctgTransEntry.organizationPartyId?has_content> <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : acctgTransEntry.organizationPartyId}, false)> <#if partyName.partyTypeId == "PERSON"> - ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} + ${partyName.firstName!} ${partyName.lastName!} <#elseif (partyName.partyTypeId) != "PARTY_GROUP"> - ${partyName.groupName?if_exists} + ${partyName.groupName!} </#if> </#if> </td> <td> <#if (acctgTransEntry.glAccountTypeId)?has_content> <#assign glAccountType = delegator.findOne("GlAccountType", {"glAccountTypeId" : acctgTransEntry.glAccountTypeId}, false)> - ${glAccountType.description?if_exists} + ${glAccountType.description!} </#if> </td> - <td>${acctgTransEntry.accountCode?if_exists}</td> - <td>${acctgTransEntry.accountName?if_exists}</td> + <td>${acctgTransEntry.accountCode!}</td> + <td>${acctgTransEntry.accountName!}</td> <td> <#if acctgTransEntry.glAccountClassId?has_content> <#assign glAccountClass = delegator.findOne("GlAccountClass", {"glAccountClassId" : acctgTransEntry.glAccountClassId}, false)/> - ${glAccountClass.description?if_exists} + ${glAccountClass.description!} </#if> </td> - <td>${acctgTransEntry.partyId?if_exists}</td> + <td>${acctgTransEntry.partyId!}</td> <td> <#if acctgTransEntry.reconcileStatusId?has_content> <#assign status = delegator.findOne("StatusItem", {"statusId" : finAccountTrans.statusId}, true)> - ${status.description?if_exists} + ${status.description!} </#if> </td> <td> <#if acctgTransEntry.acctgTransEntryTypeId?has_content> <#assign acctgTransEntryType = delegator.findOne("AcctgTransEntryType", {"acctgTransEntryTypeId" : acctgTransEntry.acctgTransEntryTypeId}, true)> - ${acctgTransEntryType.description?if_exists} + ${acctgTransEntryType.description!} </#if> </td> </tr> 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=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl Sat Aug 16 11:34:57 2014 @@ -41,7 +41,7 @@ under the License. </tr> <#if PayrolList?has_content> <#list PayrolList as payrolList> - <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> + <#if payrolList.parentTypeId! == payrolGroup.invoiceItemTypeId!> <tr> <td align="right"> ${payrolList.description} : Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl Sat Aug 16 11:34:57 2014 @@ -55,18 +55,18 @@ under the License. <fo:table-body> <fo:table-row> <fo:table-cell> - <fo:block number-columns-spanned="2" font-weight="bold">${invoice.getRelatedOne("InvoiceType", false).get("description",locale)?if_exists}</fo:block> + <fo:block number-columns-spanned="2" font-weight="bold">${invoice.getRelatedOne("InvoiceType", false).get("description",locale)!}</fo:block> </fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${invoiceDetail.invoiceDate?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${invoiceDetail.invoiceDate!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell> <fo:table-cell> <fo:block> - <#if partyName?has_content>${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}</#if> + <#if partyName?has_content>${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}</#if> </fo:block> </fo:table-cell> </fo:table-row> @@ -107,19 +107,19 @@ under the License. <#assign billingAddress = invoiceDetail.billingAddress /> <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> <fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> - <#if billingAddress.attnName?exists> + <#if billingAddress.attnName??> <fo:block>${billingAddress.attnName}</fo:block> </#if> - <fo:block>${billingAddress.address1?if_exists}</fo:block> - <#if billingAddress.address2?exists> + <fo:block>${billingAddress.address1!}</fo:block> + <#if billingAddress.address2??> <fo:block>${billingAddress.address2}</fo:block> </#if> <fo:block> - <#assign stateGeo = (delegator.findOne("Geo", {"geoId", billingAddress.stateProvinceGeoId?if_exists}, false))?if_exists /> - ${billingAddress.city?if_exists} <#if stateGeo?has_content>${stateGeo.geoName?if_exists}</#if> ${billingAddress.postalCode?if_exists} + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", billingAddress.stateProvinceGeoId!}, false))! /> + ${billingAddress.city!} <#if stateGeo?has_content>${stateGeo.geoName!}</#if> ${billingAddress.postalCode!} </fo:block> <#else> - <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound} <#if partyName?has_content>${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}</#if></fo:block> + <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound} <#if partyName?has_content>${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}</#if></fo:block> </#if> </fo:table-cell> </fo:table-row> @@ -130,7 +130,7 @@ under the License. <fo:block> <#if invoiceDetail.orders?has_content> - <#assign orders = invoiceDetail.orders?if_exists /> + <#assign orders = invoiceDetail.orders! /> <fo:table width="100%" table-layout="fixed" space-after="0.3in"> <fo:table-column column-width="1in"/> <fo:table-column column-width="5.5in"/> @@ -148,7 +148,7 @@ under the License. </#if> <#if invoiceDetail.invoiceItems?has_content> - <#assign invoiceItems = invoiceDetail.invoiceItems?if_exists /> + <#assign invoiceItems = invoiceDetail.invoiceItems! /> <fo:table width="100%" table-layout="fixed"> <fo:table-column column-width="20mm"/> <fo:table-column column-width="20mm"/> @@ -185,12 +185,12 @@ under the License. <#-- if the item has a description, then use its description. Otherwise, use the description of the invoiceItemType --> <#list invoiceItems as invoiceItem> <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType", false)> - <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> - <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)?if_exists> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)!> + <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)!> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)!> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> </#if> @@ -204,7 +204,7 @@ under the License. <#assign description=itemType.get("description",locale)> </#if> - <#if newShipmentId?exists & newShipmentId != currentShipmentId> + <#if newShipmentId?? & newShipmentId != currentShipmentId> <#-- the shipment id is printed at the beginning for each group of invoice items created for the same shipment --> @@ -230,19 +230,19 @@ under the License. <fo:block> ${invoiceItem.invoiceItemSeqId} </fo:block> </fo:table-cell> <fo:table-cell> - <fo:block text-align="left">${invoiceItem.productId?if_exists} </fo:block> + <fo:block text-align="left">${invoiceItem.productId!} </fo:block> </fo:table-cell> <fo:table-cell> - <fo:block text-align="right">${description?if_exists}</fo:block> + <fo:block text-align="right">${description!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block text-align="center"> <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number}</#if> </fo:block> + <fo:block text-align="center"> <#if invoiceItem.quantity??>${invoiceItem.quantity?string.number}</#if> </fo:block> </fo:table-cell> <fo:table-cell text-align="right"> - <fo:block> <#if invoiceItem.quantity?exists><@ofbizCurrency amount=invoiceItem.amount?if_exists isoCode=invoice.currencyUomId?if_exists/></#if> </fo:block> + <fo:block> <#if invoiceItem.quantity??><@ofbizCurrency amount=invoiceItem.amount! isoCode=invoice.currencyUomId!/></#if> </fo:block> </fo:table-cell> <fo:table-cell text-align="right"> - <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> </fo:block> + <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> </#list> @@ -258,8 +258,8 @@ under the License. <fo:table-cell text-align="right" number-columns-spanned="2"> <fo:block font-weight="bold"> <#if invoiceDetail.invoiceTotal?has_content> - <#assign invoiceTotal = invoiceDetail.invoiceTotal?if_exists /> - <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId?if_exists/> + <#assign invoiceTotal = invoiceDetail.invoiceTotal! /> + <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId!/> </#if> </fo:block> </fo:table-cell> @@ -279,8 +279,8 @@ under the License. <fo:table-cell number-columns-spanned="1" text-align="right"> <fo:block> <#if invoiceDetail.invoiceNoTaxTotal?has_content> - <#assign invoiceNoTaxTotal = invoiceDetail.invoiceNoTaxTotal?if_exists /> - <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> + <#assign invoiceNoTaxTotal = invoiceDetail.invoiceNoTaxTotal! /> + <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId!/> </#if> </fo:block> </fo:table-cell> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Sat Aug 16 11:34:57 2014 @@ -31,14 +31,14 @@ under the License. <#if billingAddress?has_content> <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> <fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> - <#if billingAddress.attnName?exists> + <#if billingAddress.attnName??> <fo:block>${billingAddress.attnName}</fo:block> </#if> - <fo:block>${billingAddress.address1?if_exists}</fo:block> - <#if billingAddress.address2?exists> + <fo:block>${billingAddress.address1!}</fo:block> + <#if billingAddress.address2??> <fo:block>${billingAddress.address2}</fo:block> </#if> - <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> + <fo:block>${billingAddress.city!} ${billingAddress.stateProvinceGeoId!} ${billingAddress.postalCode!}</fo:block> <#if billToPartyTaxId?has_content> <fo:block>${uiLabelMap.PartyTaxId}: ${billToPartyTaxId}</fo:block> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Sat Aug 16 11:34:57 2014 @@ -29,7 +29,7 @@ under the License. <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${invoiceDate!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Sat Aug 16 11:34:57 2014 @@ -54,7 +54,7 @@ under the License. <#assign termType = term.getRelatedOne("TermType", false)/> <fo:table-row> <fo:table-cell> - <fo:block font-size ="10pt" font-weight="bold">${termType.description?if_exists} ${term.description?if_exists} ${term.termDays?if_exists} ${term.textValue?if_exists}</fo:block> + <fo:block font-size ="10pt" font-weight="bold">${termType.description!} ${term.description!} ${term.termDays!} ${term.textValue!}</fo:block> </fo:table-cell> </fo:table-row> </#list> @@ -98,12 +98,12 @@ under the License. <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType", false)> <#assign isItemAdjustment = Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "InvoiceItemType", "invoiceItemTypeId", itemType.getString("invoiceItemTypeId"), "parentTypeId", "INVOICE_ADJ")/> - <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> - <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)?if_exists> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)!> + <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)!> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)!> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> <#assign issuedDateTime = itemIssuance.issuedDateTime/> @@ -118,7 +118,7 @@ under the License. <#assign description=itemType.get("description",locale)> </#if> - <#if newShipmentId?exists & newShipmentId != currentShipmentId> + <#if newShipmentId?? & newShipmentId != currentShipmentId> <#-- the shipment id is printed at the beginning for each group of invoice items created for the same shipment --> @@ -129,7 +129,7 @@ under the License. </fo:table-row> <fo:table-row height="14px"> <fo:table-cell number-columns-spanned="5"> - <fo:block font-weight="bold"> ${uiLabelMap.ProductShipmentId}: ${newShipmentId}<#if issuedDateTime?exists> ${uiLabelMap.CommonDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(issuedDateTime)}</#if></fo:block> + <fo:block font-weight="bold"> ${uiLabelMap.ProductShipmentId}: ${newShipmentId}<#if issuedDateTime??> ${uiLabelMap.CommonDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(issuedDateTime)}</#if></fo:block> </fo:table-cell> </fo:table-row> <#assign currentShipmentId = newShipmentId> @@ -137,23 +137,23 @@ under the License. <#if !isItemAdjustment> <fo:table-row height="14px" space-start=".15in"> <fo:table-cell> - <fo:block text-align="left">${invoiceItem.productId?if_exists} </fo:block> + <fo:block text-align="left">${invoiceItem.productId!} </fo:block> </fo:table-cell> <fo:table-cell border-top-style="solid" border-top-width="thin" border-top-color="black"> - <fo:block text-align="left">${description?if_exists}</fo:block> + <fo:block text-align="left">${description!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block text-align="right"> <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number}</#if> </fo:block> + <fo:block text-align="right"> <#if invoiceItem.quantity??>${invoiceItem.quantity?string.number}</#if> </fo:block> </fo:table-cell> <fo:table-cell text-align="right"> - <fo:block> <#if invoiceItem.quantity?exists><@ofbizCurrency amount=invoiceItem.amount?if_exists isoCode=invoice.currencyUomId?if_exists/></#if> </fo:block> + <fo:block> <#if invoiceItem.quantity??><@ofbizCurrency amount=invoiceItem.amount! isoCode=invoice.currencyUomId!/></#if> </fo:block> </fo:table-cell> <fo:table-cell text-align="right"> - <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> </fo:block> + <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> <#else> - <#if !(invoiceItem.parentInvoiceId?exists && invoiceItem.parentInvoiceItemSeqId?exists)> + <#if !(invoiceItem.parentInvoiceId?? && invoiceItem.parentInvoiceItemSeqId??)> <fo:table-row> <fo:table-cell><fo:block/></fo:table-cell> <fo:table-cell border-top-style="solid" border-top-width="thin" border-top-color="black"><fo:block/></fo:table-cell> @@ -162,10 +162,10 @@ under the License. </#if> <fo:table-row height="14px" space-start=".15in"> <fo:table-cell number-columns-spanned="2"> - <fo:block text-align="right">${description?if_exists}</fo:block> + <fo:block text-align="right">${description!}</fo:block> </fo:table-cell> <fo:table-cell text-align="right" number-columns-spanned="3"> - <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> </fo:block> + <fo:block> <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> </#if> @@ -185,7 +185,7 @@ under the License. <fo:block font-weight="bold">${uiLabelMap.AccountingTotalCapital}</fo:block> </fo:table-cell> <fo:table-cell text-align="right" border-top-style="solid" border-top-width="thin" border-top-color="black"> - <fo:block><@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId?if_exists/></fo:block> + <fo:block><@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId!/></fo:block> </fo:table-cell> </fo:table-row> <fo:table-row height="7px"> @@ -202,7 +202,7 @@ under the License. </fo:table-cell> <fo:table-cell text-align="right" border-top-style="solid" border-top-width="thin" border-top-color="black"> <fo:block> - <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId!/> </fo:block> </fo:table-cell> </fo:table-row> @@ -241,7 +241,7 @@ under the License. <fo:block>${taxRate.description}</fo:block> </fo:table-cell> <fo:table-cell number-columns-spanned="1" text-align="right"> - <fo:block font-weight="bold"><@ofbizCurrency amount=vatTaxesByType[vatTaxId] isoCode=invoice.currencyUomId?if_exists/></fo:block> + <fo:block font-weight="bold"><@ofbizCurrency amount=vatTaxesByType[vatTaxId] isoCode=invoice.currencyUomId!/></fo:block> </fo:table-cell> </fo:table-row> </#list> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |