svn commit: r805012 [2/11] - in /ofbiz/branches/executionconte
Locked
svn commit: r805012 [2/11] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Mon Aug 17 15:42:56 2009 @@ -138,7 +138,7 @@ || UtilValidate.isEmpty(notifyUrl) || UtilValidate.isEmpty(returnUrl) || UtilValidate.isEmpty(imageUrl) - || UtilValidate.isEmpty(payPalAccount) ) { + || UtilValidate.isEmpty(payPalAccount)) { Debug.logError("Payment properties is not configured properly, some notify URL from PayPal is not correctly defined!", module); request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingMerchantConfiguration", locale)); return "error"; Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Mon Aug 17 15:42:56 2009 @@ -443,7 +443,7 @@ EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("infoString"), EntityComparisonOperator.EQUALS, EntityFunction.UPPER(emailAddress)), EntityUtil.getFilterByDateExpr() - )); + )); try { GenericValue matchingEmail = EntityUtil.getFirst(delegator.findList("PartyAndContactMech", cond, null, UtilMisc.toList("fromDate"), null, false)); if (matchingEmail != null) { @@ -527,7 +527,7 @@ EntityCondition.makeCondition(UtilMisc.toMap("attnName", null, "directions", null, "postalCodeExt", null,"postalCodeGeoId", null)), EntityUtil.getFilterByDateExpr(), EntityCondition.makeCondition("partyId", partyId) - )); + )); try { GenericValue postalMatch = EntityUtil.getFirst(delegator.findList("PartyAndPostalAddress", cond, null, UtilMisc.toList("fromDate"), null, false)); if (postalMatch != null) { @@ -535,7 +535,7 @@ EntityCondition purposeCond = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition(UtilMisc.toMap("partyId", partyId, "contactMechId", postalContactId)), EntityUtil.getFilterByDateExpr() - )); + )); List<GenericValue> postalPurposes = delegator.findList("PartyContactMechPurpose", purposeCond, null, null, null, false); List<Object> purposeStrings = EntityUtil.getFieldListFromEntityList(postalPurposes, "contactMechPurposeTypeId", false); if (UtilValidate.isNotEmpty(purposeStrings) && purposeStrings.contains("SHIPPING_LOCATION")) { @@ -593,7 +593,7 @@ try { EntityCondition cond = EntityCondition.makeCondition( UtilMisc.toMap("productStoreId", cart.getProductStoreId(), "partyId", shipMethodSplit[0], "roleTypeId", "CARRIER", "description", shippingMethodTypeDesc) - ); + ); GenericValue shipmentMethod = EntityUtil.getFirst(delegator.findList("ProductStoreShipmentMethView", cond, null, null, null, false)); cart.setShipmentMethodTypeId(shipmentMethod.getString("shipmentMethodTypeId")); } catch (GenericEntityException e1) { Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Accounting Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> @@ -2169,6 +2170,11 @@ <request-map uri="SalesInvoiceByProductCategorySummary"><security https="true" auth="true"/><response name="success" type="view" value="SalesInvoiceByProductCategorySummary"/></request-map> <request-map uri="TrialBalance"><security https="true" auth="true"/><response name="success" type="view" value="TrialBalance"/></request-map> <request-map uri="IncomeStatement"><security https="true" auth="true"/><response name="success" type="view" value="IncomeStatement"/></request-map> + <request-map uri="ComparativeIncomeStatement"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ComparativeIncomeStatement"/> + <response name="error" type="view" value="ComparativeIncomeStatement"/> + </request-map> <request-map uri="prepareIncomeStatement"> <security https="true" auth="true"/> <event type="service" invoke="prepareIncomeStatement"/> @@ -2315,6 +2321,17 @@ <response name="success" type="view" value="TrialBalanceSearchResultsCsv"/> </request-map> + <request-map uri="ComparativeIncomeStatements.csv"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ComparativeIncomeStatementsCsv"/> + <response name="error" type="view" value="ComparativeIncomeStatement"/> + </request-map> + <request-map uri="ComparativeIncomeStatements.pdf"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ComparativeIncomeStatementsPdf"/> + <response name="error" type="view" value="ComparativeIncomeStatement"/> + </request-map> + <!--Global GL Settings --> <request-map uri="acctgTransDetailReportPdf.pdf"> <security https="true" auth="true"/> @@ -2665,6 +2682,7 @@ <view-map name="SalesInvoiceByProductCategorySummary" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#SalesInvoiceByProductCategorySummary"/> <view-map name="TrialBalance" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalance"/> <view-map name="IncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatement"/> + <view-map name="ComparativeIncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatement"/> <view-map name="BalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheet"/> <view-map name="ComparativeBalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheet"/> <view-map name="TransactionTotals" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TransactionTotals"/> @@ -2717,6 +2735,7 @@ <view-map name="CostCenters" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#CostCenters"/> <view-map name="CostCenterReport" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#CostCenterReport"/> <view-map name="CostCentersReportPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#CostCentersReportPdf" content-type="application/pdf" encoding="none"/> - + <view-map name="ComparativeIncomeStatementsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsPdf" content-type="application/pdf" encoding="none"/> + <view-map name="ComparativeIncomeStatementsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsCsv" content-type="text/csv" encoding="none"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Aug 17 15:42:56 2009 @@ -37,6 +37,12 @@ <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> <td>${currentGlReconciliation.glReconciliationName?if_exists}</td> </tr> + <#if currentGlReconciliation.reconciledBalance?exists> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> + <td>${currentGlReconciliation.reconciledBalance?if_exists}</td> + </tr> + </#if> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> <td>${currentGlReconciliation.reconciledDate?if_exists}</td> @@ -56,10 +62,12 @@ <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> <td>${previousGlReconciliation.glReconciliationName?if_exists}</td> </tr> - <tr> - <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> - <td>${previousGlReconciliation.reconciledBalance?if_exists}</td> - </tr> + <#if previousGlReconciliation.reconciledBalance?exists> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> + <td>${previousGlReconciliation.reconciledBalance?if_exists}</td> + </tr> + </#if> <tr> <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> <td>${previousGlReconciliation.reconciledDate?if_exists}</td> @@ -121,7 +129,7 @@ <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.amount?if_exists}</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> @@ -138,7 +146,7 @@ </#if> </div> <div class="right"> - <span class="label">${uiLabelMap.AccountingTotalCapital} </span>${transactionTotalAmount.grandTotal?if_exists} + <span class="label">${uiLabelMap.AccountingTotalCapital} </span><@ofbizCurrency amount=transactionTotalAmount.grandTotal isoCode=defaultOrganizationPartyCurrencyUomId/> <#if !currentGlReconciliation.reconciledBalance?has_content> <input type="submit" value="${uiLabelMap.AccountingReconcile}"/> </#if> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl Mon Aug 17 15:42:56 2009 @@ -23,13 +23,13 @@ <#if PayrolGroup?has_content> <#list PayrolGroup as payrolGroup> <tr class="header-row" > - <td> - [${payrolGroup.description}] - </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> + <td> + [${payrolGroup.description}] + </td> + <td> </td> + <td> </td> + <td> </td> + <td> </td> </tr> <tr class="header-row"> @@ -39,21 +39,21 @@ <td> </td> <td> </td> </tr> - <#if PayrolList?has_content> - <#list PayrolList as payrolList> - <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> + <#if PayrolList?has_content> + <#list PayrolList as payrolList> + <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> <tr> - <td align="right"> - ${payrolList.description} : - </td> - <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Quantity"/></td> - <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Amount"/></td> - <td> </td> - <td> </td> + <td align="right"> + ${payrolList.description} : + </td> + <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Quantity"/></td> + <td ><input type="text" size=10 name="${payrolList.invoiceItemTypeId}_Amount"/></td> + <td> </td> + <td> </td> </tr> - </#if> - </#list> - </#if> + </#if> + </#list> + </#if> </#list> </#if> <tr class="header-row"> @@ -64,11 +64,11 @@ <td> </td> </tr> <tr > - <td align="right"><b>Add all values : </b></td> - <td align="center" ><input type="submit" value="Add"></td> - <td> </td> - <td> </td> - <td> </td> + <td align="right"><b>Add all values : </b></td> + <td align="center" ><input type="submit" value="Add"></td> + <td> </td> + <td> </td> + <td> </td> </tr> </table> </form> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Mon Aug 17 15:42:56 2009 @@ -174,28 +174,28 @@ <#assign InvoiceItems = invoice.getRelated("InvoiceItem")?if_exists> <#assign PayrolGroups = PayrolGroup?if_exists> <#list PayrolGroups as payrolGroup> - <#assign fontSize = "75%"> - <#assign lineStyle = "dashed"> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> - <#assign sumQuantity = 0> - <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign quantity = 0> - <#assign amount = 0> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> @@ -208,25 +208,25 @@ <fo:block font-weight="bold" text-align="center">Amount</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > - <fo:block font-weight="bold" text-align="center">Sum</fo:block> - </fo:table-cell> + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> </fo:table-row> </#if> <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> @@ -234,26 +234,26 @@ <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> </fo:table-row> - </#if> - </#list> + </#if> + </#list> - <#assign sumQuantity = 0> + <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> @@ -264,7 +264,7 @@ <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> </fo:table-row> - </#if> + </#if> </#list> <fo:table-row font-size="${fontSize}"> @@ -370,28 +370,28 @@ <#assign InvoiceItems = invoice.getRelated("InvoiceItem")?if_exists> <#assign PayrolGroups = PayrolGroup?if_exists> <#list PayrolGroups as payrolGroup> - <#assign fontSize = "75%"> - <#assign lineStyle = "dashed"> + <#assign fontSize = "75%"> + <#assign lineStyle = "dashed"> - <#assign sumQuantity = 0> - <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign quantity = 0> - <#assign amount = 0> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumQuantity = 0> + <#assign sumAmount = 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign quantity = 0> + <#assign amount = 0> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-bottom-style="${lineStyle}"> @@ -404,25 +404,25 @@ <fo:block font-weight="bold" text-align="center">Amount</fo:block> </fo:table-cell> <fo:table-cell padding="3pt" border-bottom-style="${lineStyle}" > - <fo:block font-weight="bold" text-align="center">Sum</fo:block> - </fo:table-cell> + <fo:block font-weight="bold" text-align="center">Sum</fo:block> + </fo:table-cell> </fo:table-row> </#if> <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0 ><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3"><fo:block>${invoiceItemType.description?if_exists}</fo:block></fo:table-cell> @@ -430,26 +430,26 @@ <fo:table-cell padding="3pt"><fo:block text-align="center">${amount?if_exists}</fo:block></fo:table-cell> <fo:table-cell padding="3pt"><fo:block text-align="center">${subTotal?if_exists}</fo:block></fo:table-cell> </fo:table-row> - </#if> - </#list> + </#if> + </#list> - <#assign sumQuantity = 0> + <#assign sumQuantity = 0> <#assign sumAmount = 0> - <#assign sumSubTotal = 0> - <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> - <#assign subTotal = 0> - <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> - <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> - <#assign subTotal = quantity * amount> - <#assign sumQuantity = sumQuantity + quantity> - <#assign sumAmount = sumAmount + amount> - <#assign sumSubTotal = sumSubTotal + subTotal> - </#if> - </#list> - <#if sumSubTotal != 0> + <#assign sumSubTotal = 0> + <#list InvoiceItems as invoiceItem> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType")?if_exists> + <#assign subTotal = 0> + <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0></#if> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0></#if> + <#if amount != 0 && quantity == 0><#assign quantity = 1></#if> + <#assign subTotal = quantity * amount> + <#assign sumQuantity = sumQuantity + quantity> + <#assign sumAmount = sumAmount + amount> + <#assign sumSubTotal = sumSubTotal + subTotal> + </#if> + </#list> + <#if sumSubTotal != 0> <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> <fo:table-cell padding="3pt" number-columns-spanned="3" border-top-style="${lineStyle}"><fo:block/></fo:table-cell> @@ -460,7 +460,7 @@ <fo:table-row font-size="${fontSize}"> <fo:table-cell padding="3pt"><fo:block/></fo:table-cell> </fo:table-row> - </#if> + </#if> </#list> <fo:table-row font-size="${fontSize}"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl Mon Aug 17 15:42:56 2009 @@ -34,14 +34,14 @@ <div>NOTE: each set of numbers is: <quantity>:<total amount>:<average amount></div> <table class="basic-table" cellspacing="0"> <#-- Create the header row --> - <tr class="header-row"> - <td>Day</td> - <td>[No Product]</td> + <tr class="header-row"> + <td>Day</td> + <td>[No Product]</td> <#list productList as product> - <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</td> + <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</td> </#list> <#list productCategoryList as productCategory> - <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</td> + <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</td> </#list> </tr> <#-- Days of the month --> @@ -49,32 +49,32 @@ <#assign productResultMap = productResultMapByDayList.get(productNullResult_index)/> <#assign categoryResultMap = categoryResultMapByDayList.get(productNullResult_index)/> - <#-- now do the null product, then iterate through the products, then categories --> - <tr> - <td class="label">${(productNullResult_index + 1)}</td> - <td><@resultSummary resultMap=productNullResult/></td> + <#-- now do the null product, then iterate through the products, then categories --> + <tr> + <td class="label">${(productNullResult_index + 1)}</td> + <td><@resultSummary resultMap=productNullResult/></td> <#list productList as product> <#assign productResult = productResultMap[product.productId]?if_exists/> - <td><@resultSummary resultMap=productResult/></td> + <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]?if_exists/> - <td><@resultSummary resultMap=categoryResult/></td> + <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> </#list> <#-- Totals for the month --> - <tr> - <td class="label">Month Total</td> - <td><@resultSummary resultMap=monthProductNullResult/></td> + <tr> + <td class="label">Month Total</td> + <td><@resultSummary resultMap=monthProductNullResult/></td> <#list productList as product> <#assign productResult = monthProductResultMap[product.productId]?if_exists/> - <td><@resultSummary resultMap=productResult/></td> + <td><@resultSummary resultMap=productResult/></td> </#list> <#list productCategoryList as productCategory> <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]?if_exists/> - <td><@resultSummary resultMap=categoryResult/></td> + <td><@resultSummary resultMap=categoryResult/></td> </#list> </tr> </table> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml Mon Aug 17 15:42:56 2009 @@ -248,7 +248,7 @@ <parameter param-name="finAccountId"/> </hyperlink> </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> <hyperlink target="deleteDepositSlip" description="${uiLabelMap.CommonCancel}" also-hidden="false"> <parameter param-name="paymentGroupId"/> <parameter param-name="finAccountId"/> @@ -399,6 +399,7 @@ <entity-one entity-name="PartyNameView" value-field="partyName"> <field-map field-name="partyId" from-field="glReconciliation.organizationPartyId"/> </entity-one> + <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/> </row-actions> <auto-fields-service service-name="updateGlReconciliation" default-field-type="display" map-name="glReconciliation"/> <field name="glReconciliationId"> @@ -412,5 +413,6 @@ <parameter param-name="partyId" from-field="partyName.partyId"/> </hyperlink> </field> + <field name="reconciledBalance"><display type="currency" currency="${currencyUomId}"></display></field> </form> </forms> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml Mon Aug 17 15:42:56 2009 @@ -594,9 +594,6 @@ <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <entity-one entity-name="GlReconciliation" value-field="currentGlReconciliation"/> - <entity-and entity-name="FinAccountTrans" list="finAccountTransList"> - <field-map field-name="glReconciliationId"/> - </entity-and> <entity-condition entity-name="GlReconciliation" list="glReconciliationList"> <condition-list combine="and"> <condition-expr field-name="reconciledDate" operator="less" from-field="currentGlReconciliation.reconciledDate" ignore-if-empty="true"/> @@ -604,7 +601,8 @@ </condition-list> <order-by field-name="reconciledDate DESC"/> </entity-condition> - <service service-name="getTransactionTotalByGlReconcileId" result-map="transactionTotalAmount"/> + <service service-name="getFinAccountTransListAndTotals" result-map="transactionTotalAmount"/> + <set field="finAccountTransList" from-field="transactionTotalAmount.finAccountTransList" type="List"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml Mon Aug 17 15:42:56 2009 @@ -756,6 +756,11 @@ <parameter param-name="organizationPartyId"/> </link> </menu-item> + <menu-item name="ComparativeIncomeStatement" title="${uiLabelMap.AccountingComparativeIncomeStatement}"> + <link target="ComparativeIncomeStatement"> + <parameter param-name="organizationPartyId"/> + </link> + </menu-item> <menu-item name="BalanceSheet" title="${uiLabelMap.AccountingBalanceSheet}"> <link target="BalanceSheet"> <parameter param-name="organizationPartyId"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml Mon Aug 17 15:42:56 2009 @@ -37,6 +37,11 @@ <field-map field-name="entityName" value="PaymentGroup"/> </service> </actions> + <row-actions> + <entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers" filter-by-date="true"> + <field-map field-name="paymentGroupId"/> + </entity-and> + </row-actions> <field name="paymentGroupId" widget-style="buttontext"> <hyperlink description="${paymentGroupId}" target="PaymentGroupOverview"> <parameter param-name="paymentGroupId"/> @@ -44,17 +49,17 @@ </field> <field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field> <field name="paymentGroupName"><display/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false"> <parameter param-name="paymentGroupId"/> </hyperlink> </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'}"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false"> <parameter param-name="paymentGroupId"/> </hyperlink> </field> - <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> <hyperlink target="DepositSlip.pdf" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> <parameter param-name="paymentGroupId"/> </hyperlink> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryForms.xml Mon Aug 17 15:42:56 2009 @@ -541,4 +541,49 @@ <field name="totalInventoryCost" use-when="currencyUomId==null" title="${uiLabelMap.CommonTotalValue}"><display description="${uiLabelMap.ProductDifferentCurrencies}"/></field> </form> + <form name="ComparativeIncomeStatementParameters" type="single" header-row-style="header-row" default-table-style="basic-table"> + <field name="period1FromDate" title="${uiLabelMap.FormFieldTitle_period1FromDate}" required-field="true" position="1"><date-time type="timestamp"/></field> + <field name="period1ThruDate" title="${uiLabelMap.FormFieldTitle_period1ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field> + <field name="period2FromDate" title="${uiLabelMap.FormFieldTitle_period2FromDate}" required-field="true" position="1"><date-time type="timestamp"/></field> + <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field> + <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"> + <drop-down> + <entity-options entity-name="GlFiscalType" description="${description}"> + <entity-order-by field-name="glFiscalTypeId"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" tooltip="Please enter From and Thru date in fields above"><submit button-type="button"/></field> + </form> + + <form name="ComparativeIncomeStatementList" type="list" list-name="glAccountIncomeList" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <row-actions> + <entity-one entity-name="GlAccount" value-field="glAccount"/> + </row-actions> + <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> + <hyperlink target="FindAcctgTransEntries" description="${glAccountId}"> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> + </hyperlink> + </field> + <field name="glAccountId" use-when="isPdf == true"><display description="${glAccountId}"/></field> + <field name="accountName" title="${uiLabelMap.FormFieldTitle_accountName}"><display description="${glAccount.accountName}"/></field> + <field name="period1TotalAmount" title="${uiLabelMap.AccountingPeriod1TotalAmount}"><display type="currency" currency="${currencyUomId}"/></field> + <field name="period2TotalAmount" title="${uiLabelMap.AccountingPeriod1TotalAmount}"><display type="currency" currency="${currencyUomId}"/></field> + </form> + + <form name="ComparativeExpenseStatementList" type="list" list-name="glAccountExpenseList" extends="ComparativeIncomeStatementList"/> + + <form name="ComparativeIncomeStatementsCsv" type="list" list-name="glAccountIncomeList" view-size="99999"> + <row-actions> + <entity-one entity-name="GlAccount" value-field="glAccount"/> + </row-actions> + <field name="glAccountId"><display description="${glAccountId}"/></field> + <field name="accountName" title="${uiLabelMap.FormFieldTitle_accountName}"><display description="${glAccount.accountName}"/></field> + <field name="period1TotalAmount" title="${uiLabelMap.AccountingPeriod1TotalAmount}"><display type="currency" currency="${currencyUomId}"/></field> + <field name="period2TotalAmount" title="${uiLabelMap.AccountingPeriod1TotalAmount}"><display type="currency" currency="${currencyUomId}"/></field> + </form> + + <form name="ComparativeExpenseStatementsCsv" type="list" list-name="glAccountExpenseList" view-size="99999" extends="ComparativeIncomeStatementsCsv"/> </forms> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml Mon Aug 17 15:42:56 2009 @@ -375,7 +375,7 @@ </link> <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container> <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> - <container style="h3"><label text="${uiLabelMap.AccountingExpences}"/></container> + <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container> <include-form name="ExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> </container> </container> @@ -697,7 +697,7 @@ <decorator-section name="body"> <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container> <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> - <container style="h3"><label text="${uiLabelMap.AccountingExpences}"/></container> + <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container> <include-form name="ExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> <container><label style="h3" text="${uiLabelMap.AccountingNetIncome}: ${totalNetIncome}"/></container> </decorator-section> @@ -716,7 +716,7 @@ <widgets> <container><label text="${uiLabelMap.AccountingIncome}"/></container> <include-form name="IncomeStatementListCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> - <container><label text="${uiLabelMap.AccountingExpences}"/></container> + <container><label text="${uiLabelMap.AccountingExpenses}"/></container> <include-form name="ExpenseStatementListCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> <container><label text="${uiLabelMap.AccountingNetIncome}: ${totalNetIncome}"/></container> </widgets> @@ -1217,4 +1217,104 @@ </section> </screen> + <screen name="ComparativeIncomeStatement"> + <section> + <actions> + <set field="titleProperty" value="AccountingComparativeIncomeStatement"/> + <set field="tabButtonItem" value="OrganizationAccountingReports"/> + <set field="tabButtonItem2" value="ComparativeIncomeStatement"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/> + <set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/> + <set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/> + <set field="displaySearchResult" value="${period1TotalNetIncome != 0 || period2TotalNetIncome != 0}" type="Boolean"/> + </actions> + <widgets> + <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.AccountingComparativeIncomeStatement}"> + <include-form name="ComparativeIncomeStatementParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </screenlet> + <section> + <condition> + <if-compare field="displaySearchResult" operator="equals" value="true" type="Boolean"/> + </condition> + <widgets> + <screenlet title="${uiLabelMap.AccountingComparativeIncomeStatement}"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="ComparativeIncomeStatements.csv"> + <parameter param-name="period1FromDate" from-field="parameters.period1FromDate"/> + <parameter param-name="period1ThruDate" from-field="parameters.period1ThruDate"/> + <parameter param-name="period2FromDate" from-field="parameters.period2FromDate"/> + <parameter param-name="period2ThruDate" from-field="parameters.period2ThruDate"/> + <parameter param-name="organizationPartyId"/> + <parameter param-name="currencyUomId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="ComparativeIncomeStatements.pdf"> + <parameter param-name="period1FromDate" from-field="parameters.period1FromDate"/> + <parameter param-name="period1ThruDate" from-field="parameters.period1ThruDate"/> + <parameter param-name="period2FromDate" from-field="parameters.period2FromDate"/> + <parameter param-name="period2ThruDate" from-field="parameters.period2ThruDate"/> + <parameter param-name="organizationPartyId"/> + <parameter param-name="currencyUomId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + </link> + <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container> + <include-form name="ComparativeIncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container> + <include-form name="ComparativeExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </screenlet> + <container><label style="h3" text="${uiLabelMap.AccountingPeriod1NetIncome}: ${period1TotalNetIncome}"/></container> + <container><label style="h3" text="${uiLabelMap.AccountingPeriod2NetIncome}: ${period2TotalNetIncome}"/></container> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="ComparativeIncomeStatementsPdf"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="isPdf" value="true" type="Boolean"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <set field="currencyUomId" from-field="parameters.currencyUomId"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/> + </actions> + <widgets> + <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container> + <include-form name="ComparativeIncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container> + <include-form name="ComparativeExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <container><label style="h3" text="${uiLabelMap.AccountingPeriod1NetIncome}: ${period1TotalNetIncome}"/></container> + <container><label style="h3" text="${uiLabelMap.AccountingPeriod2NetIncome}: ${period2TotalNetIncome}"/></container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="ComparativeIncomeStatementsCsv"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <set field="currencyUomId" from-field="parameters.currencyUomId"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/> + </actions> + <widgets> + <container><label text="${uiLabelMap.AccountingIncome}"/></container> + <include-form name="ComparativeIncomeStatementsCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <container><label text="${uiLabelMap.AccountingExpenses}"/></container> + <include-form name="ComparativeExpenseStatementsCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <container><label text="${uiLabelMap.AccountingPeriod1NetIncome}: ${period1TotalNetIncome}"/></container> + <container><label text="${uiLabelMap.AccountingPeriod2NetIncome}: ${period2TotalNetIncome}"/></container> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/executioncontext20090812/applications/commonext/config/CommonExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/commonext/config/CommonExtUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/commonext/config/CommonExtUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/commonext/config/CommonExtUiLabels.xml Mon Aug 17 15:42:56 2009 @@ -31,4 +31,7 @@ <property key="CommonExtHelpOnScreen"> <value xml:lang="en">What's on the screen?</value> </property> + <property key="CommonExtIndex"> + <value xml:lang="en">Index</value> + </property> </resource> Modified: ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml Mon Aug 17 15:42:56 2009 @@ -25,8 +25,9 @@ <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/> - + <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> Modified: ofbiz/branches/executioncontext20090812/applications/commonext/webapp/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/commonext/webapp/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/commonext/webapp/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/commonext/webapp/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -20,11 +20,19 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> - <description>Party Manager Module Site Configuration File</description> + <description>General Application CommonExt Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> - <!-- Request Mappings --> + <request-map uri="view"> + <security https="false" auth="false"/> + <response name="success" type="request" value="main"/> + </request-map> + <request-map uri="views"> + <security https="true" auth="false"/> + <response name="success" type="request" value="main"/> + </request-map> + <request-map uri="deleteAllSystemNotes"> <security https="true" auth="true"/> <event type="service" invoke="deleteAllSystemNotes"/> @@ -37,5 +45,6 @@ </request-map> <view-map name="showHelp" type="screen" page="component://commonext/widget/HelpScreens.xml#ShowHelp"/> + <view-map name="ShowDocument" type="screen" page="component://commonext/widget/HelpScreens.xml#showDocument"/> </site-conf> Modified: ofbiz/branches/executioncontext20090812/applications/commonext/widget/HelpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/commonext/widget/HelpScreens.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/commonext/widget/HelpScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/commonext/widget/HelpScreens.xml Mon Aug 17 15:42:56 2009 @@ -21,55 +21,159 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="ShowHelp"> + <screen name="LookupDecorator"> <section> - <condition> - <if-empty field="parameters.portalPageId"/> - </condition> <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.CommonExtHelpTitle}"/> - <entity-and entity-name="Content" list="contents"> - <field-map field-name="contentName" from-field="parameters.helpTopic"/> - </entity-and> - <set field="content" from-field="contents[0]"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <service service-name="getUserPreferenceGroup" result-map="prefResult"> + <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/> + </service> + <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/> + + <property-map resource="general" map-name="generalProperties" global="true"/> + <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/> + <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/> + <service service-name="getVisualThemeResources"> + <field-map field-name="visualThemeId"/> + <field-map field-name="themeResources" from-field="layoutSettings"/> + </service> + <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> + <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/> </actions> <widgets> + <platform-specific><html><html-template location="component://common/webcommon/includes/lookup.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> + <container style="contentarea"> + <container id="column-container"> + <!-- by default will render left-bar only if leftbarScreen value not empty --> + <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> + <container id="content-main-section" style="${MainColumnStyle}"> + <decorator-section-include name="body"/> + </container> + </container> + </container> + <container style="clear"></container> + + <platform-specific><html><html-template location="component://common/webcommon/includes/lookupFooter.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + + <screen name="ShowHelp"> + <section> + <condition> + <and> + <if-compare field="parameters.helpTopic" operator="equals" value="navigateHelp"/> + <if-empty field="parameters.portalPageId"/> + </and> + </condition> + <widgets> + <include-screen name="navigateHelp"/> + </widgets> + <fail-widgets> <section> <condition> - <if-empty field="content"/> + <if-empty field="parameters.portalPageId"/> </condition> + <actions> + <set field="title" value="${uiLabelMap.CommonExtHelpTitle}"/> + <set field="contentId" value="${parameters.contentId}" default-value="HELP_ROOT"/> + <entity-one entity-name="Content" value-field="content"/> + </actions> <widgets> - <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="search-options"/> - <decorator-section name="search-results"> - <label style="h2" text="Content with content name: ${parameters.helpTopic} could not be found"></label> - </decorator-section> - </decorator-screen> + <section> + <condition> + <if-empty field="content"/> + </condition> + <widgets> + <include-screen name="navigateHelp"/> + </widgets> + <fail-widgets> + <decorator-screen name="LookupDecorator"> + <decorator-section name="body"> + <screenlet title="${uilabelMap.CommonExtHelpTitle}" navigation-menu-name="lookupMenu"> + <include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/> + <include-screen name="showDocument"/> + </screenlet> + </decorator-section> + </decorator-screen> + </fail-widgets> + </section> </widgets> <fail-widgets> - <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="search-options"/> - <decorator-section name="search-results"> - <content content-id="${content.contentId}" templateResourceId="${layoutSettings.VT_HELP_TEMPL}"/> - </decorator-section> - </decorator-screen> - </fail-widgets> - </section> - </widgets> - <fail-widgets> - <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="search-options"> - <content content-id="HELP-MY-PORTAL"/> - </decorator-section> - <decorator-section name="search-results"> - <screenlet title="Select a portlet you would like to have help on...."> + <decorator-screen name="LookupDecorator"> + <decorator-section name="body"> + <screenlet title="${uilabelMap.CommonExtHelpTitle}"> + <content content-id="HELP_MYPORTAL"/> + </screenlet> + <screenlet title="Select a portlet you would like to have help on...." navigation-menu-name="lookupMenu"> + <include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/> <include-form name="PortletList" location="component://common/widget/PortalPageForms.xml"/> </screenlet> </decorator-section> </decorator-screen> + </fail-widgets> + </section> </fail-widgets> </section> </screen> + <screen name="showDocument"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> + <set field="contentId" from-field="parameters.contentId" default-value="${contentId}"/> + <property-map resource="general" map-name="generalProperties" global="true"/> + <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/> + <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/> + <service service-name="getVisualThemeResources"> + <field-map field-name="visualThemeId"/> + <field-map field-name="themeResources" from-field="layoutSettings"/> + </service> + <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> + </actions> + <widgets> + <container id="Document"> + <content content-id="${contentId}"/> + </container> + </widgets> + </section> + </screen> + + <screen name="navigateHelp"> + <section> + <actions> + <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/> + <set field="titleProperty" value="PageTitleNavigateContent"/> + <entity-and entity-name="ContentAssoc" list="contentAssoc"> + <field-map field-name="contentId" value="HELP_ROOT"/> + <field-map field-name="contentAssocTypeId" value="TREE_CHILD"/> + <order-by field-name="sequenceNum"/> + </entity-and> + <set field="contentId" from-field="parameters.contentId" default-value="HELP_ROOT"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator"> + <decorator-section name="body"> + <section> + <widgets> + <screenlet title="${uiLabelMap.PageTitleNavigateContent}" > + <container style="left-border"> + <container id="EditDocumentTree"/> + <platform-specific><html><html-template location="component://content/webapp/content/content/DisplayContentNav.ftl"/></html></platform-specific> + </container> + <container style="leftonly"> + <include-screen name="showDocument"/> + </container> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml Mon Aug 17 15:42:56 2009 @@ -465,14 +465,13 @@ <!-- help template --> -<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELP_TEMPL" resourceValue="HELP-TEMPL-FLAT_GREY" sequenceId="01"/> -<DataResource dataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> -<ElectronicText dataResourceId="HELP-TEMPL-FLAT_GREY"> +<DataResource dataResourceId="HELP_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> +<ElectronicText dataResourceId="HELP_TEMPL"> <textData><![CDATA[ +<#if layoutSettings.VT_NAME[0] == "FLAT_GREY"> <div class="contentarea"> <div id="column-container"> <div id="content-main-section"> - <#if doc.root.definition?has_content> <h1>${uiLabelMap.CommonExtHelpDefinition}</h1> <p class=h2>${doc.root.definition}</p></br> @@ -490,14 +489,63 @@ <#if doc.root.general?has_content> <h1>${doc.root.generalTitle?if_exists}</h1> - <p class=h2>${doc.root.general}</p> + <#list doc.root.general.section as section> + <p class=h2>${section.text}</p> + </#list> </#if> </div> </div> </div> + +<#elseif layoutSettings.VT_NAME[0] == "BIZZNESS_TIME"> + <#if doc.root.definition?has_content> + <h1>${uiLabelMap.CommonExtHelpDefinition}</h1> + <p class=h2>${doc.root.definition}</p></br> + </#if> + + <#if doc.root.usedFor?has_content> + <h1>${uiLabelMap.CommonExtHelpUsedFor}</h1> + <p class=h2>${doc.root.usedFor}</p></br> + </#if> + + <#if doc.root.onScreen?has_content> + <h1>${uiLabelMap.CommonExtHelpOnScreen}</h1> + <p class=h2>${doc.root.onScreen}</p> + </#if> + + <#if doc.root.general?has_content> + <h1>${doc.root.generalTitle?if_exists}</h1> + <#list doc.root.general.section as section> + <p class=h2>${section.text}</p> + </#list> + </#if> +<#else> + <#if doc.root.definition?has_content> + <h1>${uiLabelMap.CommonExtHelpDefinition}</h1> + <p class=h2>${doc.root.definition}</p></br> + </#if> + + <#if doc.root.usedFor?has_content> + <h1>${uiLabelMap.CommonExtHelpUsedFor}</h1> + <p class=h2>${doc.root.usedFor}</p></br> + </#if> + + <#if doc.root.onScreen?has_content> + <h1>${uiLabelMap.CommonExtHelpOnScreen}</h1> + <p class=h2>${doc.root.onScreen}</p> + </#if> + + <#if doc.root.general?has_content> + <h1>${doc.root.generalTitle?if_exists}</h1> + <#list doc.root.general.section as section> + <p class=h2>${section.text}</p> + </#list> + </#if> +</#if> + + ]]></textData> </ElectronicText> - </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml Mon Aug 17 15:42:56 2009 @@ -34,14 +34,16 @@ <entity-resource type="data" reader-name="seed" loader="main" location="data/MimeTypeTemplate.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SeedBlogData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/HelpTypeData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogUsersData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogMiscData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogEntryData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/WebSitePublishPointData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/CompDocData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ForumDemoData.xml"/> Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original) +++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Mon Aug 17 15:42:56 2009 @@ -66,7 +66,7 @@ Map paramMap = UtilHttp.getParameterMap(request); //if (Debug.infoOn()) Debug.logInfo("in updateStaticValues, paramMap:" + paramMap , module); String parentPlaceholderId = (String)paramMap.get("ph"); - if ( UtilValidate.isEmpty(parentPlaceholderId)) { + if (UtilValidate.isEmpty(parentPlaceholderId)) { request.setAttribute("_ERROR_MESSAGE_", "ParentPlaceholder is empty."); return "error"; } @@ -131,7 +131,7 @@ Map results = dispatcher.runSync("updateContentAssoc", serviceIn); } } - } else if ( UtilValidate.isNotEmpty(pubValue)) { + } else if (UtilValidate.isNotEmpty(pubValue)) { if (pubValue.equalsIgnoreCase("Y")) { serviceIn.put("thruDate", UtilDateTime.nowTimestamp()); Timestamp fromDate = (Timestamp)map.get(pubContentId + "FromDate"); @@ -190,7 +190,7 @@ //if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, roles:" + roles +" roleTypeList:" + roleTypeList , module); String permittedAction = (String)paramMap.get("permittedAction"); // The content to be linked to one or more sites String permittedOperations = (String)paramMap.get("permittedOperations"); // The content to be linked to one or more sites - if ( UtilValidate.isEmpty(targContentId)) { + if (UtilValidate.isEmpty(targContentId)) { request.setAttribute("_ERROR_MESSAGE_", "targContentId is empty."); return "error"; } @@ -200,7 +200,7 @@ try { // TODO: this needs to be given author userLogin GenericValue authorUserLogin = delegator.findByPrimaryKeyCache("UserLogin", UtilMisc.toMap("userLoginId", authorId)); - origPublishedLinkList = ContentManagementWorker.getPublishedLinks(delegator, targContentId, webSiteId, userLogin, security, permittedAction, permittedOperations, roles ); + origPublishedLinkList = ContentManagementWorker.getPublishedLinks(delegator, targContentId, webSiteId, userLogin, security, permittedAction, permittedOperations, roles); } catch (GenericEntityException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -321,7 +321,7 @@ } } } - } else if ( UtilValidate.isNotEmpty(origSubContentId)) { + } else if (UtilValidate.isNotEmpty(origSubContentId)) { // if no current link is passed in, look to see if there is an existing link(s) that must be disabled List oldActiveValues = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", targContentId, "contentIdTo", origSubContentId, "contentAssocTypeId", "PUBLISH_LINK", "thruDate", null)); Iterator iterOldActive = oldActiveValues.iterator(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |