svn commit: r736582 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: hansbak
Date: Wed Jan 21 23:23:12 2009 New Revision: 736582 URL: http://svn.apache.org/viewvc?rev=736582&view=rev Log: add the function to print a payrol check, with payslip detail from the invoice Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml 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=736582&r1=736581&r2=736582&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Wed Jan 21 23:23:12 2009 @@ -122,6 +122,7 @@ <fo:block text-align="center">${payment.effectiveDate?date?string.short}</fo:block> </fo:table-cell> </fo:table-row> + <fo:table-row> <fo:table-cell padding="3pt"> <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block> @@ -143,6 +144,7 @@ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingPayment}</fo:block> </fo:table-cell> </fo:table-row> + </fo:table-header> <fo:table-body> @@ -153,7 +155,7 @@ <fo:block>${payment.effectiveDate?date?string.short}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> - <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice}</#if></fo:block> + <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> <fo:block> @@ -168,8 +170,111 @@ <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")?if_exists> + <#assign PayrolGroups = PayrolGroup?if_exists> + <#list PayrolGroups as payrolGroup> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> + <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:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Quantity</fo:block> + </fo:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Amount</fo:block> + </fo:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> + </fo:table-row> + </#if> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + <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-row> + </#if> + </#list> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> + <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-row> + <fo:table-row font-size="${fontSize}"> + <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> + </fo:table-row> + </#if> + + </#list> + <fo:table-row font-size="${fontSize}"> + <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> + <fo:table-cell padding="3pt" number-columns-spanned="6" border-top-style="solid"><fo:block/></fo:table-cell> + </fo:table-row> + </#if> + </#list> - + <fo:table-row> <fo:table-cell padding="3pt" number-columns-spanned="6"> <fo:block text-align="end">${uiLabelMap.AccountingCheckAmount}</fo:block> @@ -246,7 +351,7 @@ <fo:block>${payment.effectiveDate?date?string.short}</fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> - <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice}</#if></fo:block> + <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="3pt"> <fo:block> @@ -261,8 +366,111 @@ <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")?if_exists> + <#assign PayrolGroups = PayrolGroup?if_exists> + <#list PayrolGroups as payrolGroup> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> + <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:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Quantity</fo:block> + </fo:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Amount</fo:block> + </fo:table-cell> + <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> + </fo:table-row> + </#if> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + <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-row> + </#if> + </#list> + + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> + <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-row> + <fo:table-row font-size="${fontSize}"> + <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> + </fo:table-row> + </#if> + + </#list> + <fo:table-row font-size="${fontSize}"> + <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> + <fo:table-cell padding="3pt" number-columns-spanned="6" border-top-style="solid"><fo:block/></fo:table-cell> + </fo:table-row> + </#if> + </#list> - + <fo:table-row> <fo:table-cell padding="3pt" number-columns-spanned="6"> <fo:block text-align="end">${uiLabelMap.AccountingCheckAmount}</fo:block> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=736582&r1=736581&r2=736582&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Wed Jan 21 23:23:12 2009 @@ -108,7 +108,7 @@ <set field="titleProperty" value="PageTitleEditPayment"/> <set field="tabButtonItem" value="editPayment"/> <set field="paymentId" from-field="parameters.paymentId"/> - <entity-one entity-name="Payment" value-name="payment"> + <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" env-name="parameters.paymentId"/> </entity-one> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> @@ -145,7 +145,7 @@ <set field="titleProperty" value="PageTitleListPaymentApplications"/> <set field="tabButtonItem" value="editPaymentApplications"/> <set field="paymentId" from-field="parameters.paymentId"/> - <entity-one entity-name="Payment" value-name="payment"/> + <entity-one entity-name="Payment" value-field="payment"/> <set field="appliedAmount" type="String" value="${bsh: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment)));}"/> @@ -155,41 +155,41 @@ return(NumberFormat.getCurrencyInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)));}"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy"/> - <entity-one entity-name="PartyNameView" value-name="partyNameViewTo"> + <entity-one entity-name="PartyNameView" value-field="partyNameViewTo"> <field-map field-name="partyId" env-name="payment.partyIdTo"/> </entity-one> - <entity-one entity-name="PartyNameView" value-name="partyNameViewFrom"> + <entity-one entity-name="PartyNameView" value-field="partyNameViewFrom"> <field-map field-name="partyId" env-name="payment.partyIdFrom"/> </entity-one> - <entity-condition entity-name="PaymentApplication" list-name="paymentApplications"> + <entity-condition entity-name="PaymentApplication" list="paymentApplications"> <condition-expr field-name="paymentId" operator="equals" value="${paymentId}"/> </entity-condition> - <entity-condition entity-name="PaymentApplication" list-name="paymentApplicationsInv"> + <entity-condition entity-name="PaymentApplication" list="paymentApplicationsInv"> <condition-list combine="and"> <condition-expr field-name="paymentId" operator="equals" value="${paymentId}"/> - <condition-expr field-name="invoiceId" operator="not-equals" env-name="null"/> + <condition-expr field-name="invoiceId" operator="not-equals" from-field="null"/> </condition-list> <order-by field-name="invoiceId"/> <order-by field-name="invoiceItemSeqId"/> </entity-condition> - <entity-condition entity-name="PaymentApplication" list-name="paymentApplicationsPay"> + <entity-condition entity-name="PaymentApplication" list="paymentApplicationsPay"> <condition-list combine="and"> - <condition-expr field-name="paymentId" operator="equals" env-name="paymentId"/> - <condition-expr field-name="toPaymentId" operator="not-equals" env-name="null"/> + <condition-expr field-name="paymentId" operator="equals" from-field="paymentId"/> + <condition-expr field-name="toPaymentId" operator="not-equals" from-field="null"/> </condition-list> <order-by field-name="toPaymentId"/> </entity-condition> - <entity-condition entity-name="PaymentApplication" list-name="paymentApplicationsBil"> + <entity-condition entity-name="PaymentApplication" list="paymentApplicationsBil"> <condition-list combine="and"> - <condition-expr field-name="paymentId" env-name="paymentId"/> - <condition-expr field-name="billingAccountId" operator="not-equals" env-name="null"/> + <condition-expr field-name="paymentId" from-field="paymentId"/> + <condition-expr field-name="billingAccountId" operator="not-equals" from-field="null"/> </condition-list> <order-by field-name="billingAccountId"/> </entity-condition> - <entity-condition entity-name="PaymentApplication" list-name="paymentApplicationsTax"> + <entity-condition entity-name="PaymentApplication" list="paymentApplicationsTax"> <condition-list combine="and"> - <condition-expr field-name="paymentId" env-name="paymentId"/> - <condition-expr field-name="taxAuthGeoId" operator="not-equals" env-name="null"/> + <condition-expr field-name="paymentId" from-field="paymentId"/> + <condition-expr field-name="taxAuthGeoId" operator="not-equals" from-field="null"/> </condition-list> <order-by field-name="taxAuthGeoId"/> </entity-condition> @@ -199,7 +199,7 @@ <decorator-section name="body"> <section> <condition> - <if-empty field-name="paymentApplications"/> + <if-empty field="paymentApplications"/> </condition> <widgets> <container><label style="h1" text="${uiLabelMap.AccountingPayment} ${uiLabelMap.AccountingApplications}"/></container> @@ -209,7 +209,7 @@ <fail-widgets> <section> <condition> - <not><if-empty field-name="paymentApplicationsInv"/></not> + <not><if-empty field="paymentApplicationsInv"/></not> </condition> <widgets> <screenlet title="${uiLabelMap.AccountingPayment} ${uiLabelMap.AccountingApplications}"> @@ -220,16 +220,16 @@ <section> <condition> <or> - <not><if-empty field-name="paymentApplicationsPay"/></not> - <not><if-empty field-name="paymentApplicationsBil"/></not> - <not><if-empty field-name="paymentApplicationsTax"/></not> + <not><if-empty field="paymentApplicationsPay"/></not> + <not><if-empty field="paymentApplicationsBil"/></not> + <not><if-empty field="paymentApplicationsTax"/></not> </or> </condition> <widgets> <screenlet title="${uiLabelMap.CommonAmount} ${uiLabelMap.CommonTotal} ${payment.amount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingAmountNotApplied} ${notAppliedAmount?currency(${payment.currencyUomId})}"> <section> <condition> - <not><if-empty field-name="paymentApplicationsPay"/></not> + <not><if-empty field="paymentApplicationsPay"/></not> </condition> <widgets> <include-form name="editPaymentApplicationsPay" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> @@ -237,7 +237,7 @@ </section> <section> <condition> - <not><if-empty field-name="paymentApplicationsBil"/></not> + <not><if-empty field="paymentApplicationsBil"/></not> </condition> <widgets> <include-form name="editPaymentApplicationsBil" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> @@ -245,7 +245,7 @@ </section> <section> <condition> - <not><if-empty field-name="paymentApplicationsTax"/></not> + <not><if-empty field="paymentApplicationsTax"/></not> </condition> <widgets> <include-form name="editPaymentApplicationsTax" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> @@ -258,14 +258,14 @@ </section> <section> <condition> - <if-compare field-name="notAppliedAmount" operator="greater" value="0.00" type="BigDecimal"/> + <if-compare field="notAppliedAmount" operator="greater" value="0.00" type="BigDecimal"/> </condition> <widgets> <section> <condition> <or> - <not><if-empty field-name="invoices"/></not> - <not><if-empty field-name="invoicesOtherCurrency"/></not> + <not><if-empty field="invoices"/></not> + <not><if-empty field="invoicesOtherCurrency"/></not> </or> </condition> <widgets> @@ -276,7 +276,7 @@ </container> <section> <condition> - <not><if-empty field-name="invoices"/></not> + <not><if-empty field="invoices"/></not> </condition> <widgets> <include-form name="listInvoicesNotApplied" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> @@ -284,7 +284,7 @@ </section> <section> <condition> - <not><if-empty field-name="invoicesOtherCurrency"/></not> + <not><if-empty field="invoicesOtherCurrency"/></not> </condition> <widgets> <label style="h2" text="Othercurrency invoices"/> @@ -296,7 +296,7 @@ </section> <section> <condition> - <not><if-empty field-name="payments"/></not> + <not><if-empty field="payments"/></not> </condition> <widgets> <screenlet title="${uiLabelMap.AccountingListPaymentsNotYetApplied}"> @@ -325,7 +325,7 @@ <set field="tabButtonItem" value="paymentOverview"/> <set field="labelTitleProperty" value="PageTitlePaymentOverview"/> <set field="paymentId" from-field="parameters.paymentId"/> - <entity-one entity-name="Payment" value-name="payment"/> + <entity-one entity-name="Payment" value-field="payment"/> <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/> <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/> </actions> @@ -334,7 +334,7 @@ <decorator-section name="body"> <section> <condition> - <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/> + <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/> </condition> <widgets> <container style="lefthalf"> @@ -439,6 +439,9 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy"/> + <entity-condition entity-name="InvoiceItemType" list="PayrolGroup"> + <condition-expr field-name="parentTypeId" value="PAYROL"/> + </entity-condition> </actions> <widgets> <platform-specific> @@ -477,7 +480,7 @@ </container> <section> <condition> - <not><if-empty field-name="invoicePaymentInfoList"/></not> + <not><if-empty field="invoicePaymentInfoList"/></not> </condition> <widgets> <container style="screenlet"> @@ -530,7 +533,7 @@ </container> <section> <condition> - <not><if-empty field-name="invoicePaymentInfoList"/></not> + <not><if-empty field="invoicePaymentInfoList"/></not> </condition> <widgets> <container style="screenlet"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |