svn commit: r1618554 [2/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [2/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Mon Aug 18 07:42:27 2014 @@ -1173,7 +1173,6 @@ public class ValueLinkServices { // get the send to email address - key defined in properties file String sendToKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.sendToEmail"); String sendToEmail = (String) answerMap.get(sendToKey); - // get the copyMe flag and set the order email address String orderEmails = orh.getOrderEmailString(); String copyMeField = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.copyMe"); @@ -1262,10 +1261,6 @@ public class ValueLinkServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); // set the bcc address(s) @@ -1515,10 +1510,6 @@ public class ValueLinkServices { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { Map<String, Object> emailCtx = FastMap.newInstance(); - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/common/creditcardfields.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/common/creditcardfields.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Mon Aug 18 07:42:27 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> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Mon Aug 18 07:42:27 2014 @@ -149,18 +149,18 @@ by hand from a real template using a rul <fo:table-body> <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)!> <fo:table-row> <fo:table-cell padding="3pt"> <fo:block>${payment.effectiveDate?date?string.short}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> - <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> + <fo:block><#if invoice??>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> <fo:block> - <#if invoice?exists>${invoice.referenceNumber?if_exists}</#if> - ${paymentApplication.taxAuthGeoId?if_exists} + <#if invoice??>${invoice.referenceNumber!}</#if> + ${paymentApplication.taxAuthGeoId!} </fo:block> </fo:table-cell> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> @@ -170,9 +170,9 @@ by hand from a real template using a rul <fo:block text-align="end">${paymentApplication.getBigDecimal("amountApplied").setScale(decimals, rounding).toString()}</fo:block> </fo:table-cell> </fo:table-row> - <#if invoice.invoiceTypeId?if_exists == "PAYROL_INVOICE"> - <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)?if_exists> - <#assign PayrolGroups = PayrolGroup?if_exists> + <#if invoice.invoiceTypeId! == "PAYROL_INVOICE"> + <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!> + <#assign PayrolGroups = PayrolGroup!> <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> @@ -181,13 +181,13 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -199,7 +199,7 @@ by hand from a real template using a rul <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> - <fo:block font-weight="bold">${payrolGroup.description?if_exists}</fo:block> + <fo:block font-weight="bold">${payrolGroup.description!}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > <fo:block font-weight="bold" text-align="center">Quantity</fo:block> @@ -217,11 +217,11 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -229,10 +229,10 @@ by hand from a real template using a rul <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> - <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${quantity?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${quantity!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${amount!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#list> @@ -241,11 +241,11 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -257,9 +257,9 @@ by hand from a real template using a rul <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumQuantity?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumAmount?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="solid" border-bottom-style="${lineStyle}"><fo:block text-align="right">${sumSubTotal?if_exists}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumQuantity!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumAmount!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="solid" border-bottom-style="${lineStyle}"><fo:block text-align="right">${sumSubTotal!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> @@ -345,18 +345,18 @@ by hand from a real template using a rul <fo:table-body> <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)!> <fo:table-row> <fo:table-cell padding="3pt"> <fo:block>${payment.effectiveDate?date?string.short}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> - <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> + <fo:block><#if invoice??>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> <fo:block> - <#if invoice?exists>${invoice.referenceNumber?if_exists}</#if> - ${paymentApplication.taxAuthGeoId?if_exists} + <#if invoice??>${invoice.referenceNumber!}</#if> + ${paymentApplication.taxAuthGeoId!} </fo:block> </fo:table-cell> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> @@ -366,9 +366,9 @@ by hand from a real template using a rul <fo:block text-align="end">${paymentApplication.getBigDecimal("amountApplied").setScale(decimals, rounding).toString()}</fo:block> </fo:table-cell> </fo:table-row> - <#if invoice.invoiceTypeId?if_exists == "PAYROL_INVOICE"> - <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)?if_exists> - <#assign PayrolGroups = PayrolGroup?if_exists> + <#if invoice.invoiceTypeId! == "PAYROL_INVOICE"> + <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!> + <#assign PayrolGroups = PayrolGroup!> <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> @@ -377,13 +377,13 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -395,7 +395,7 @@ by hand from a real template using a rul <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> - <fo:block font-weight="bold">${payrolGroup.description?if_exists}</fo:block> + <fo:block font-weight="bold">${payrolGroup.description!}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > <fo:block font-weight="bold" text-align="center">Quantity</fo:block> @@ -413,11 +413,11 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -425,10 +425,10 @@ by hand from a real template using a rul <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> - <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${quantity?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${quantity!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${amount!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#list> @@ -437,11 +437,11 @@ by hand from a real template using a rul <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0></#if> <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -453,9 +453,9 @@ by hand from a real template using a rul <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumQuantity?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumAmount?if_exists}</fo:block></fo:table-cell> - <fo:table-cell padding="3pt" border-top-style="solid" border-bottom-style="${lineStyle}"><fo:block text-align="right">${sumSubTotal?if_exists}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumQuantity!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="${lineStyle}"><fo:block text-align="center">${sumAmount!}</fo:block></fo:table-cell> + <fo:table-cell padding="3pt" border-top-style="solid" border-bottom-style="${lineStyle}"><fo:block text-align="right">${sumSubTotal!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Mon Aug 18 07:42:27 2014 @@ -73,13 +73,13 @@ function getPaymentRunningTotal() { <div class="screenlet-body"> <form id="depositWithdrawPaymentsForm" name="depositWithdrawPaymentsForm" method="post" action="<@ofbizUrl>depositWithdrawPayments</@ofbizUrl>"> <#if paymentList?has_content> - <input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}" /> - <input type="hidden" name='finAccountId' value="${finAccountId?if_exists}" /> - <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId?if_exists}" /> - <input type="hidden" name='cardType' value="${cardType?if_exists}" /> - <input type="hidden" name='partyIdFrom' value="${partyIdFrom?if_exists}" /> - <input type="hidden" name='fromDate' value="${fromDate?if_exists}" /> - <input type="hidden" name='thruDate' value="${thruDate?if_exists}" /> + <input type="hidden" name='organizationPartyId' value="${organizationPartyId!}" /> + <input type="hidden" name='finAccountId' value="${finAccountId!}" /> + <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId!}" /> + <input type="hidden" name='cardType' value="${cardType!}" /> + <input type="hidden" name='partyIdFrom' value="${partyIdFrom!}" /> + <input type="hidden" name='fromDate' value="${fromDate!}" /> + <input type="hidden" name='thruDate' value="${thruDate!}" /> <input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT" /> <div> <span class="label">${uiLabelMap.AccountingRunningTotal} :</span> @@ -99,11 +99,11 @@ function getPaymentRunningTotal() { <#list paymentList as payment> <tr <#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>paymentOverview?paymentId=${payment.paymentId}</@ofbizUrl>">${payment.paymentId}</a></td> - <td>${payment.paymentTypeDesc?if_exists}</td> + <td>${payment.paymentTypeDesc!}</td> <td>${(payment.partyFromFirstName)!} ${(payment.partyFromLastName)!} ${(payment.partyFromGroupName)!}</td> <td>${(payment.partyToFirstName)!} ${(payment.partyToLastName)!} ${(payment.partyToGroupName)!}</td> <td><@ofbizCurrency amount=payment.amount isoCode=payment.currencyUomId/></td> - <td>${payment.effectiveDate?if_exists}</td> + <td>${payment.effectiveDate!}</td> <td align="right">${uiLabelMap.AccountingDeposit}<input type="checkbox" id="paymentId_${payment_index}" name="paymentIds" value="${payment.paymentId}" onclick="javascript:getPaymentRunningTotal();"/></td> </tr> <#assign alt_row = !alt_row> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |