svn commit: r1343479 [2/2] - in /ofbiz/trunk/applications/acco
Locked
svn commit: r1343479 [2/2] - in /ofbiz/trunk/applications/acco
 
|
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=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl Tue May 29 04:11:43 2012 @@ -55,7 +55,7 @@ under the License. <fo:table-body> <fo:table-row> <fo:table-cell> - <fo:block number-columns-spanned="2" font-weight="bold">${invoice.getRelatedOne("InvoiceType").get("description",locale)?if_exists}</fo:block> + <fo:block number-columns-spanned="2" font-weight="bold">${invoice.getRelatedOne("InvoiceType", false).get("description",locale)?if_exists}</fo:block> </fo:table-cell> </fo:table-row> <fo:table-row> @@ -184,13 +184,13 @@ under the License. <#assign newShipmentId = ""> <#-- 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")> - <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct")?if_exists> + <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType", false)> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling")?if_exists> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance")?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> </#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=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Tue May 29 04:11:43 2012 @@ -23,7 +23,7 @@ under the License. <fo:table-body> <fo:table-row> <fo:table-cell> - <fo:block number-columns-spanned="2" font-weight="bold">${invoice.getRelatedOne("InvoiceType").get("description",locale)}</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> 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=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Tue May 29 04:11:43 2012 @@ -51,7 +51,7 @@ under the License. <fo:table-body> <#list terms as term> - <#assign termType = term.getRelatedOne("TermType")/> + <#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> @@ -95,15 +95,15 @@ under the License. <#assign newShipmentId = ""> <#-- 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")> + <#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")?if_exists> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling")?if_exists> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance")?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> <#assign issuedDateTime = itemIssuance.issuedDateTime/> 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=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Tue May 29 04:11:43 2012 @@ -149,7 +149,7 @@ by hand from a real template using a rul <fo:table-body> <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice")?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> <fo:table-row> <fo:table-cell padding="3pt"> <fo:block>${payment.effectiveDate?date?string.short}</fo:block> @@ -181,7 +181,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> @@ -217,7 +217,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?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> @@ -241,7 +241,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?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> @@ -345,7 +345,7 @@ by hand from a real template using a rul <fo:table-body> <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice")?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> <fo:table-row> <fo:table-cell padding="3pt"> <fo:block>${payment.effectiveDate?date?string.short}</fo:block> @@ -377,7 +377,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> @@ -413,7 +413,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?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> @@ -437,7 +437,7 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?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> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Tue May 29 04:11:43 2012 @@ -68,7 +68,7 @@ under the License. <select name="parentPeriodId"> <option value=''> </option> <#list allCustomTimePeriods as allCustomTimePeriod> - <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> <#if (currentCustomTimePeriod.parentPeriodId)?exists> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> @@ -157,7 +157,7 @@ under the License. <#assign line = 0> <#list customTimePeriods as customTimePeriod> <#assign line = line + 1> - <#assign periodType = customTimePeriod.getRelatedOneCache("PeriodType")> + <#assign periodType = customTimePeriod.getRelatedOne("PeriodType", true)> <tr> <form method="post" action='<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'> <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> @@ -168,7 +168,7 @@ under the License. <select name="parentPeriodId"> <option value=''> </option> <#list allCustomTimePeriods as allCustomTimePeriod> - <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> <#if (currentCustomTimePeriod.parentPeriodId)?exists> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> @@ -248,7 +248,7 @@ under the License. <select name="parentPeriodId"> <option value=''> </option> <#list allCustomTimePeriods as allCustomTimePeriod> - <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> <#if currentCustomTimePeriod?exists> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Tue May 29 04:11:43 2012 @@ -138,7 +138,7 @@ under the License. <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> <#if (acctgTransEntry.paymentId)??> - <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTransEntry.paymentId)!}, false)).getRelatedOne("PaymentType")/> + <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTransEntry.paymentId)!}, false)).getRelatedOne("PaymentType", false)/> ${(acctgTransEntry.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if> </#if> </fo:block> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Tue May 29 04:11:43 2012 @@ -841,7 +841,7 @@ context.put("delegator", delegator); context.put("dispatcher", dispatcher); GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy", context); var postalAddress = context.get("postalAddress"); -var country = postalAddress.getRelatedOne("CountryGeo"); +var country = postalAddress.getRelatedOne("CountryGeo", false); var phone = context.get("phone"); var email = context.get("email"); var webSite = context.get("website"); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Tue May 29 04:11:43 2012 @@ -119,7 +119,7 @@ under the License. <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> <#if (acctgTrans.paymentId)??> - <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTrans.paymentId)!}, false)).getRelatedOne("PaymentType")/> + <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTrans.paymentId)!}, false)).getRelatedOne("PaymentType", false)/> ${(acctgTrans.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if> </#if> </fo:block> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign Tue May 29 04:11:43 2012 @@ -578,7 +578,7 @@ return true;]]></method> </cell> <cell id="136"> <text-data id="279"> - <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom").getString("description")</expression> + <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom", false).getString("description")</expression> <property name="contentType">html</property> </text-data> </cell> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign Tue May 29 04:11:43 2012 @@ -527,7 +527,7 @@ return true;]]></method> </cell> <cell id="136"> <text-data id="279"> - <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom").getString("description")</expression> + <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom", false).getString("description")</expression> <property name="contentType">html</property> </text-data> </cell> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Tue May 29 04:11:43 2012 @@ -46,7 +46,7 @@ dateFormatter = new java.text.SimpleDate invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); organizationPartyId = null; -if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId")) || "PURCHASE_INVOICE".equals(invoice.getRelatedOne("InvoiceType").get("parentTypeId"))) { +if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId")) || "PURCHASE_INVOICE".equals(invoice.getRelatedOne("InvoiceType", false).get("parentTypeId"))) { organizationPartyId = invoice.get("partyId"); } else { organizationPartyId = invoice.get("partyIdFrom"); @@ -523,12 +523,12 @@ return true;]]></method> <method name="fetch"><![CDATA[if (countOfRow >= 1) return false; row["invoiceId"] = invoice.get("invoiceId"); row["description"] = invoice.get("description"); -row["invoiceTypeDescription"] = invoice.getRelatedOne("InvoiceType").get("description"); -row["statusDescription"] = invoice.getRelatedOne("StatusItem").get("description"); +row["invoiceTypeDescription"] = invoice.getRelatedOne("InvoiceType", false).get("description"); +row["statusDescription"] = invoice.getRelatedOne("StatusItem", false).get("description"); row["invoiceDate"] = invoice.get("invoiceDate"); var partyId = null; -if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId")) || "PURCHASE_INVOICE".equals(invoice.getRelatedOne("InvoiceType").get("parentTypeId"))) { +if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId")) || "PURCHASE_INVOICE".equals(invoice.getRelatedOne("InvoiceType", false).get("parentTypeId"))) { partyId = invoice.get("partyIdFrom"); } else { partyId = invoice.get("partyId"); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Tue May 29 04:11:43 2012 @@ -42,7 +42,7 @@ dateFormatter = new java.text.SimpleDate payment = delegator.findOne("Payment", UtilMisc.toMap("paymentId", paymentId), false); organizationPartyId = null; -if ("DISBURSEMENT".equals(payment.get("paymentTypeId")) || "DISBURSEMENT".equals(payment.getRelatedOne("PaymentType").get("parentTypeId"))) { +if ("DISBURSEMENT".equals(payment.get("paymentTypeId")) || "DISBURSEMENT".equals(payment.getRelatedOne("PaymentType", false).get("parentTypeId"))) { organizationPartyId = payment.get("partyIdFrom"); } else { organizationPartyId = payment.get("partyIdTo"); @@ -500,12 +500,12 @@ return true;]]></method> <method name="fetch"><![CDATA[if (countOfRow >= 1) return false; row["paymentId"] = payment.get("paymentId"); row["comments"] = payment.get("comments"); -row["paymentTypeDescription"] = payment.getRelatedOne("PaymentType").get("description"); -row["statusDescription"] = payment.getRelatedOne("StatusItem").get("description"); +row["paymentTypeDescription"] = payment.getRelatedOne("PaymentType", false).get("description"); +row["statusDescription"] = payment.getRelatedOne("StatusItem", false).get("description"); row["effectiveDate"] = payment.get("effectiveDate"); var partyId = null; -if ("RECEIPT".equals(payment.get("paymentTypeId")) || "RECEIPT".equals(payment.getRelatedOne("PaymentType").get("parentTypeId"))) { +if ("RECEIPT".equals(payment.get("paymentTypeId")) || "RECEIPT".equals(payment.getRelatedOne("PaymentType", false).get("parentTypeId"))) { partyId = payment.get("partyIdFrom"); } else { partyId = payment.get("partyIdTo"); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign Tue May 29 04:11:43 2012 @@ -395,7 +395,7 @@ this.text = dateFormatter.format(fromDat </cell> <cell id="136"> <text-data id="279"> - <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom").getString("description")</expression> + <expression name="valueExpr">delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).getRelatedOne("Uom", false).getString("description")</expression> <property name="contentType">html</property> </text-data> </cell> Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1343479&r1=1343478&r2=1343479&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Tue May 29 04:11:43 2012 @@ -193,7 +193,7 @@ function runAction() { <#list invoices as invoice> <#assign invoicePaymentInfoList = dispatcher.runSync("getInvoicePaymentInfoList", Static["org.ofbiz.base.util.UtilMisc"].toMap("invoiceId", invoice.invoiceId, "userLogin", userLogin))/> <#assign invoicePaymentInfo = invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)?if_exists> - <#assign statusItem = invoice.getRelatedOneCache("StatusItem")> + <#assign statusItem = invoice.getRelatedOne("StatusItem", true)> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td> <td>${invoice.invoiceTypeDesc?default(invoice.invoiceTypeId)}</td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |