OFBiz › OFBiz - Commits

svn commit: r926987 [2/26] - in /ofbiz/branches/multitenant20100310: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/accoun...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jonesde

svn commit: r926987 [2/26] - in /ofbiz/branches/multitenant20100310: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/accoun...

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Mar 24 09:23:07 2010
@@ -2531,7 +2531,7 @@ under the License.


<request-map uri="paymentReport">
- <security https="true" auth="true"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="paymentReport"/>
</request-map>
<request-map uri="paymentReportHtml">

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/main.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/main.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/main.ftl Wed Mar 24 09:23:07 2010
@@ -27,7 +27,7 @@ under the License.
<ul>
<li><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreementAvailable}</a></li>
</ul>
-<br/>
+<br />
</td>
</tr>
<tr>
@@ -39,7 +39,7 @@ under the License.
<ul>
<li><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">${uiLabelMap.CommonShow} ${uiLabelMap.AccountingCustomer} ${uiLabelMap.AccountingBillingAccount}</a></li>
</ul>
-<br/>
+<br />
</td>
</tr>

@@ -52,7 +52,7 @@ under the License.
<ul>
<li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingShowAllFixedAssets}</a></li>
</ul>
-<br/>
+<br />
</td>
</tr>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Wed Mar 24 09:23:07 2010
@@ -22,7 +22,7 @@ under the License.
txType?default("") == "PRDS_PAY_RELEASE" || txType?default("") == "PRDS_PAY_REFUND">
${setRequestAttribute("validTx", "true")}
<#assign validTx = true>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingReferenceNumber}</b></td>
<td width="5"> </td>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualTx.ftl Wed Mar 24 09:23:07 2010
@@ -18,7 +18,7 @@ under the License.
-->

<h1>${uiLabelMap.AccountingManualTransaction}</h1>
-<br/>
+<br />

<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
${setRequestAttribute("validTx", "false")}
@@ -106,9 +106,9 @@ under the License.
<#elseif txType?has_content>
<tr>
<td colspan="3" align="center">
- <br/>
+ <br />
<h2>${uiLabelMap.AccountingTransactionTypeNotYetSupported}</h2>
- <br/>
+ <br />
</td>
</tr>
</#if>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign Wed Mar 24 09:23:07 2010
@@ -333,22 +333,22 @@ try {
input = FastMap.newInstance();
inputFields = FastMap.newInstance();
if(params!=null){
- inputFields.put("partyIdTo", params["partyIdTo"]);
- inputFields.put("paymentId", params["paymentId"]);
- inputFields.put("paymentTypeId", params["paymentTypeId"]);
- inputFields.put("paymentId_op", params["paymentId_op"]);
- inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
- inputFields.put("noConditionFind", params["noConditionFind"]);
- inputFields.put("partyIdFrom", params["partyIdFrom"]);
- inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
- inputFields.put("amount", params["amount"]);
- inputFields.put("statusId", params["statusId"]);
- inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
- inputFields.put("paymentId_ic", params["paymentId_ic"]);
- inputFields.put("paymentRefNum", params["paymentRefNum"]);
- inputFields.put("comments_ic", params["comments_ic"]);
- inputFields.put("comments_op", params["comments_op"]);
- inputFields.put("comments", params["comments"]);
+ inputFields.put("partyIdTo", params["partyIdTo"]);
+ inputFields.put("paymentId", params["paymentId"]);
+ inputFields.put("paymentTypeId", params["paymentTypeId"]);
+ inputFields.put("paymentId_op", params["paymentId_op"]);
+ inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
+ inputFields.put("noConditionFind", params["noConditionFind"]);
+ inputFields.put("partyIdFrom", params["partyIdFrom"]);
+ inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
+ inputFields.put("amount", params["amount"]);
+ inputFields.put("statusId", params["statusId"]);
+ inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
+ inputFields.put("paymentId_ic", params["paymentId_ic"]);
+ inputFields.put("paymentRefNum", params["paymentRefNum"]);
+ inputFields.put("comments_ic", params["comments_ic"]);
+ inputFields.put("comments_op", params["comments_op"]);
+ inputFields.put("comments", params["comments"]);
}
input.put("userLogin",userLogin);
input.put("inputFields",inputFields);
@@ -364,16 +364,16 @@ try {
}]]></method>
<method name="fetch"><![CDATA[if(payments==null)return false;
if(payment=payments.next()){
- row["paymentId"] = payment.getString("paymentId");
- row["paymentType"] = payment.getString("paymentTypeId");
- row["status"] = payment.getString("statusId");
- row["from"] = payment.getString("partyIdFrom");
- row["to"] = payment.getString("partyIdTo");
- row["date"] = payment.getString("effectiveDate");
- row["amount"] = payment.getString("amount");
+ row["paymentId"] = payment.getString("paymentId");
+ row["paymentType"] = payment.getString("paymentTypeId");
+ row["status"] = payment.getString("statusId");
+ row["from"] = payment.getString("partyIdFrom");
+ row["to"] = payment.getString("partyIdTo");
+ row["date"] = payment.getString("effectiveDate");
+ row["amount"] = payment.getString("amount");
}else{
- payments.close();
- return false;
+ payments.close();
+ return false;
}
return true;]]></method>
</script-data-set>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl Wed Mar 24 09:23:07 2010
@@ -38,10 +38,10 @@ under the License.
<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 -->

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/AccountingMenus.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/AccountingMenus.xml Wed Mar 24 09:23:07 2010
@@ -378,7 +378,7 @@ under the License.
<parameter param-name="paymentId" from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
+ <menu-item name="paymentReport" title="Payment Report">
<link target="paymentReport"/>
</menu-item>
</menu>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/CommonScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/CommonScreens.xml Wed Mar 24 09:23:07 2010
@@ -73,13 +73,13 @@ under the License.
<widgets>
<include-menu name="PaymentSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
- <section>
- <condition>
- <not><if-empty field="paymentId"/></not>
- </condition>
- <widgets>
- <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
- </widgets>
+ <section>
+ <condition>
+ <not><if-empty field="paymentId"/></not>
+ </condition>
+ <widgets>
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
+ </widgets>
</section>
</container>
<decorator-section-include name="body"/>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/FixedAssetScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/FixedAssetScreens.xml Wed Mar 24 09:23:07 2010
@@ -538,8 +538,9 @@ under the License.
<section>
<condition>
<and>
- <if-compare-field field="assetDepreciationResultMap.plannedPastDepreciationTotal" to-field="depreciation" operator="greater"/>
+ <not><if-empty field="assetDepreciationResultMap.plannedPastDepreciationTotal"/></not>
<not><if-empty field="fixedAsset.partyId"/></not>
+ <if-compare-field field="assetDepreciationResultMap.plannedPastDepreciationTotal" to-field="depreciation" operator="greater" type="BigDecimal"/>
</and>
</condition>
<actions>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/GlSetupForms.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/GlSetupForms.xml Wed Mar 24 09:23:07 2010
@@ -78,7 +78,7 @@ under the License.
<service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
- <set field="aggregatedPartyAcctgPreference" from-field="result.partyAccountingPreference" type="Map"/>
+ <set field="aggregatedPartyAcctgPreference" from-field="result.partyAccountingPreference" type="Object"/>
</actions>
<alt-target use-when="partyAcctgPreference!=null" target="updatePartyAcctgPreference"/>
<auto-fields-service service-name="createPartyAcctgPreference"/>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentForms.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentForms.xml Wed Mar 24 09:23:07 2010
@@ -598,16 +598,16 @@ under the License.
<field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
</form>
<form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments" extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK">
- <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
- <drop-down>
- <option key="paymentReportHtml" description="text/html"></option>
- <option key="paymentReportPdf" description="application/pdf"></option>
- 
- </drop-down>
- </field>
- <field name="searchButton"><hidden/></field>
- <field name="report" title="Report" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
+ <drop-down>
+ <option key="paymentReportHtml" description="text/html"></option>
+ <option key="paymentReportPdf" description="application/pdf"></option>
+ 
+ </drop-down>
+ </field>
+ <field name="searchButton"><hidden/></field>
+ <field name="report" title="Report" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentGatewayConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentGatewayConfigScreens.xml Wed Mar 24 09:23:07 2010
@@ -29,11 +29,12 @@ under the License.
<widgets>

<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- 
+ <decorator-section name="pre-body">
+ <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentScreens.xml Wed Mar 24 09:23:07 2010
@@ -542,7 +542,7 @@ under the License.
<screen name="PaymentReport">
<section>
<actions>
- <set field="headerItem" value="payments"/>
+ <set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="paymentReport"/>
</actions>
<widgets>
@@ -550,9 +550,9 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
+ <screenlet title="Payment Report">
+ <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>

Modified: ofbiz/branches/multitenant20100310/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/widget/ar/CommonScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/widget/ar/CommonScreens.xml Wed Mar 24 09:23:07 2010
@@ -43,7 +43,7 @@ under the License.
<screen name="main">
<section>
<actions>
- <set field="headerItem" value="main"/>
+ <set field="tabButtonItem" value="main"></set>
<set field="parameters.portalPageId" value="ArPortalPage"/>
<set field="invoiceTypeId" value="SALES_INVOICE"/>
</actions>

Modified: ofbiz/branches/multitenant20100310/applications/commonext/data/helpdata/HELP_SystemInfoNotes.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/commonext/data/helpdata/HELP_SystemInfoNotes.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/commonext/data/helpdata/HELP_SystemInfoNotes.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/commonext/data/helpdata/HELP_SystemInfoNotes.xml Wed Mar 24 09:23:07 2010
@@ -32,7 +32,7 @@
<para>These event can be notified to the user even when not logged on to OFBiz by using a firefox plugin and when it changes the
employee is notified from within firefox </para>
<para>The plugin: http://updatescanner.mozdev.org/en/index.html and it should check the following url: (adjust to your requirements)
- <![CDATA[https://localhost:8443/myportal/control/showPortlet?portalPortletId=SystemInfoNotes&USERNAME=admin&PASSWORD=ofbiz]]></para>
+ <![CDATA[https://localhost:8443/myportal/control/showPortletSimpleDecorator?portalPortletId=SystemInfoNotes&USERNAME=admin&PASSWORD=ofbiz]]></para>
<para> In the Flat Grey theme (only) notifications show in the header when they are available. </para>
</listitem>
</orderedlist>

Modified: ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy (original)
+++ ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy Wed Mar 24 09:23:07 2010
@@ -39,5 +39,5 @@ if("website".equals(tabButtonItemTop)){
context.showScreen = "message";
return;
}
- context.webSite = webSite;
+ context.webSite = webSite;
}

Modified: ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl Wed Mar 24 09:23:07 2010
@@ -39,7 +39,7 @@ under the License.
<#list contactMeches as contactMechMap>
<#assign contactMech = contactMechMap.contactMech>
<#assign partyContactMech = contactMechMap.partyContactMech>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<tr>
<td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td>
<td>

Modified: ofbiz/branches/multitenant20100310/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/commonext/widget/CommonScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/commonext/widget/CommonScreens.xml Wed Mar 24 09:23:07 2010
@@ -39,7 +39,7 @@ under the License.
<set field="layoutSettings.suppressTab" value="ofbizsetup"/>

<service service-name="getLastSystemInfoNote" result-map="resultNote"/>
- <set field="linkStart" value="/myportal/control/showPortletDecorator?portalPortletId="/>
+ <set field="linkStart" value="/myportal/control/showPortletMainDecorator?portalPortletId="/>
<set field="layoutSettings.middleTopHeader" value="---------- ${uiLabelMap.CommonLastSytemNotes} ----------"/>
<set field="layoutSettings.middleTopMessage1" value="${groovy:resultNote.lastSystemInfoNote1!=null?resultNote.lastSystemInfoNote1.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote1.noteInfo:""}"/>
<set field="layoutSettings.middleTopLink1" value="${linkStart}${resultNote.lastSystemInfoNote1.moreInfoPortletId}&id=${resultNote.lastSystemInfoNote1.moreInfoItemId}"/>

Modified: ofbiz/branches/multitenant20100310/applications/commonext/widget/SystemInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/commonext/widget/SystemInfoForms.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/commonext/widget/SystemInfoForms.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/commonext/widget/SystemInfoForms.xml Wed Mar 24 09:23:07 2010
@@ -24,7 +24,7 @@ under the License.
<form name="SystemInfoNotes" type="list" list-name="systemInfoNotes"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateInfoCreated}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}&id=${moreInfoItemId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink target="/myportal/control/showPortletMainDecorator?portalPortletId=${moreInfoPortletId}&id=${moreInfoItemId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
</form>

<form name="EditSysInfoPortletParams" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
@@ -40,7 +40,7 @@ under the License.
<form name="SystemInfoStatus" type="list" list-name="systemInfoStatus"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateLastChanged}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink target="/myportal/control/showPortletMainDecorator?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
</form>

<form name="CreateSystemInfoNote" type="single" target="createSystemInfoNote">

Modified: ofbiz/branches/multitenant20100310/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/ofbiz-component.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/content/ofbiz-component.xml Wed Mar 24 09:23:07 2010
@@ -39,6 +39,7 @@ under the License.
<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="seed" loader="main" location="data/ContentHttpErrorData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentPortletData.xml"/>

<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>

Modified: ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/ContentManagementServices.java Wed Mar 24 09:23:07 2010
@@ -1599,7 +1599,7 @@ Debug.logInfo("updateSiteRoles, serviceC
return ServiceUtil.returnFailure(msg);

}
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", UtilMisc.toMap("orderId", orderId));
+ orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
if (orderHeader == null) {
String msg = "No OrderHeader found for orderId:" + orderId;
return ServiceUtil.returnError(msg);

Modified: ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original)
+++ ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Wed Mar 24 09:23:07 2010
@@ -31,7 +31,6 @@ import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;

import org.ofbiz.base.util.Debug;
@@ -94,22 +93,30 @@ public class CmsEvents {
String contentId = null;
String mapKey = null;

- String pathInfo = request.getPathInfo();
- if (targetRequest.equals(actualRequest)) {
- // was called directly -- path info is everything after the request
- String[] pathParsed = pathInfo.split("/", 3);
- if (pathParsed != null && pathParsed.length > 2) {
- pathInfo = pathParsed[2];
- } else {
- pathInfo = null;
- }
- } // if called through the default request, there is no request in pathinfo
+ String pathInfo = null;
+
+ // If an override view is present then use that in place of request.getPathInfo()
+ String overrideViewUri = (String) request.getAttribute("_CURRENT_CHAIN_VIEW_");
+ if (UtilValidate.isNotEmpty(overrideViewUri)) {
+ pathInfo = overrideViewUri;
+ } else {
+ pathInfo = request.getPathInfo();
+ if (targetRequest.equals(actualRequest) && pathInfo != null) {
+ // was called directly -- path info is everything after the request
+ String[] pathParsed = pathInfo.split("/", 3);
+ if (pathParsed.length > 2) {
+ pathInfo = pathParsed[2];
+ } else {
+ pathInfo = null;
+ }
+ } // if called through the default request, there is no request in pathinfo
+ }

// if path info is null; check for a default content
if (pathInfo == null) {
List<GenericValue> defaultContents = null;
try {
- defaultContents = delegator.findByAnd("WebSiteContent", UtilMisc.toMap("webSiteId", webSiteId,
+ defaultContents = delegator.findByAndCache("WebSiteContent", UtilMisc.toMap("webSiteId", webSiteId,
"webSiteContentTypeId", "DEFAULT_PAGE"), UtilMisc.toList("-fromDate"));
} catch (GenericEntityException e) {
Debug.logError(e, module);
@@ -169,23 +176,17 @@ public class CmsEvents {
// get the contentId/mapKey from URL
if (contentId == null) {
if (Debug.verboseOn()) Debug.logVerbose("Current PathInfo: " + pathInfo, module);
- if (pathInfo.indexOf("/") != -1) {
- String[] pathSplit = pathInfo.split("/");
- if (Debug.verboseOn()) Debug.logVerbose("Split pathinfo: " + pathSplit.length, module);
- if (pathSplit != null && pathSplit.length > 0) {
- contentId = pathSplit[0];
- if (pathSplit.length > 1) {
- mapKey = pathSplit[1];
- }
- }
- } else {
- contentId = pathInfo;
+ String[] pathSplit = pathInfo.split("/");
+ if (Debug.verboseOn()) Debug.logVerbose("Split pathinfo: " + pathSplit.length, module);
+ contentId = pathSplit[0];
+ if (pathSplit.length > 1) {
+ mapKey = pathSplit[1];
}
}

// verify the request content is associated with the current website
- int statusCode=-1;
- boolean hasErrorPage=false;
+ int statusCode = -1;
+ boolean hasErrorPage = false;

try {
statusCode = verifyContentToWebSite(delegator, webSiteId, contentId);
@@ -195,7 +196,7 @@ public class CmsEvents {
}

// We try to find a specific Error page for this website concerning the status code
- if (statusCode!=HttpServletResponseWrapper.SC_OK) {
+ if (statusCode != HttpServletResponse.SC_OK) {
List<GenericValue> errorContainers = null;
try {
errorContainers = delegator.findByAndCache("WebSiteContent",
@@ -212,18 +213,17 @@ public class CmsEvents {

List<GenericValue> errorPages = null;
try {
- errorPages = delegator.findByAnd("ContentAssocViewTo", UtilMisc.toMap("contentIdStart", errorContainer.getString("contentId"), "caContentAssocTypeId", "TREE_CHILD", "contentTypeId", "DOCUMENT", "caMapKey",""+statusCode));
+ errorPages = delegator.findByAnd("ContentAssocViewTo", UtilMisc.toMap("contentIdStart", errorContainer.getString("contentId"), "caContentAssocTypeId", "TREE_CHILD", "contentTypeId", "DOCUMENT", "caMapKey", String.valueOf(statusCode)));
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
errorPages = EntityUtil.filterByDate(errorPages);
if (UtilValidate.isNotEmpty(errorPages)) {
- if (Debug.verboseOn()) Debug.logVerbose("Found error pages "+ statusCode + " : " + errorPages, module);
- contentId=EntityUtil.getFirst(errorPages).getString("contentId");
- }
- else {
- if (Debug.verboseOn()) Debug.logVerbose("No specific error page, falling back to the Error Container for "+ statusCode, module);
- contentId=errorContainer.getString("contentId");
+ if (Debug.verboseOn()) Debug.logVerbose("Found error pages " + statusCode + " : " + errorPages, module);
+ contentId = EntityUtil.getFirst(errorPages).getString("contentId");
+ } else {
+ if (Debug.verboseOn()) Debug.logVerbose("No specific error page, falling back to the Error Container for " + statusCode, module);
+ contentId = errorContainer.getString("contentId");
}
mapKey = null;
hasErrorPage=true;
@@ -231,12 +231,12 @@ public class CmsEvents {
// We try to find a generic content Error page concerning the status code
if (!hasErrorPage) {
try {
- GenericValue errorPage = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", "CONTENT_ERROR_"+statusCode));
- if (errorPage!=null) {
+ GenericValue errorPage = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", "CONTENT_ERROR_" + statusCode));
+ if (errorPage != null) {
Debug.logVerbose("Found generic page " + statusCode, module);
- contentId=errorPage.getString("contentId");
+ contentId = errorPage.getString("contentId");
mapKey = null;
- hasErrorPage=true;
+ hasErrorPage = true;
}
} catch (GenericEntityException e) {
Debug.logError(e, module);
@@ -245,7 +245,7 @@ public class CmsEvents {

}

- if (statusCode==HttpServletResponseWrapper.SC_OK || hasErrorPage) {
+ if (statusCode == HttpServletResponse.SC_OK || hasErrorPage) {
// create the template map
MapStack<String> templateMap = MapStack.create();
ScreenRenderer.populateContextForRequest(templateMap, null, request, response, servletContext);
@@ -296,10 +296,9 @@ public class CmsEvents {
String siteName = null;
try {
GenericValue content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentId));
- if (content !=null && UtilValidate.isNotEmpty(content)) {
+ if (content != null && UtilValidate.isNotEmpty(content)) {
contentName = content.getString("contentName");
- }
- else {
+ } else {
request.setAttribute("_ERROR_MESSAGE_", "Content: " + contentName + " [" + contentId + "] is not a publish point for the current website: [" + webSiteId + "]");
return "error";
}
@@ -307,7 +306,7 @@ public class CmsEvents {
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
- request.setAttribute("_ERROR_MESSAGE_", "Content: " + contentName + " [" + contentId + "] is not a publish point for the current website: "+ siteName + " [" + webSiteId + "]");
+ request.setAttribute("_ERROR_MESSAGE_", "Content: " + contentName + " [" + contentId + "] is not a publish point for the current website: " + siteName + " [" + webSiteId + "]");
return "error";
}
}
@@ -317,16 +316,14 @@ public class CmsEvents {
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
- request.setAttribute("_ERROR_MESSAGE_", "Not able to find a page to display for website: "+ siteName + " [" + webSiteId + "] not even a default page!");
+ request.setAttribute("_ERROR_MESSAGE_", "Not able to find a page to display for website: " + siteName + " [" + webSiteId + "] not even a default page!");
return "error";
- // throw an unknown request error
- //throw new GeneralRuntimeException("Unknown request; this request does not exist or cannot be called directly.");
}

protected static int verifyContentToWebSite(Delegator delegator, String webSiteId, String contentId) throws GeneralException {
// first check if the passed in contentId is a publish point for the web site
List<GenericValue> publishPoints = null;
- boolean hasContent=false;
+ boolean hadContent = false;
try {
publishPoints = delegator.findByAndCache("WebSiteContent",
UtilMisc.toMap("webSiteId", webSiteId, "contentId", contentId, "webSiteContentTypeId", "PUBLISH_POINT"),
@@ -335,12 +332,12 @@ public class CmsEvents {
throw e;
}
if (UtilValidate.isNotEmpty(publishPoints)) {
- hasContent=true;
+ hadContent = true;
}
publishPoints = EntityUtil.filterByDate(publishPoints);
if (UtilValidate.isNotEmpty(publishPoints)) {
if (Debug.verboseOn()) Debug.logVerbose("Found publish points: " + publishPoints, module);
- return HttpServletResponseWrapper.SC_OK;
+ return HttpServletResponse.SC_OK;
} else {
// the passed in contentId is not a publish point for the web site;
// however we will publish its content if it is a node of one of the trees that have a publish point as the root
@@ -350,44 +347,44 @@ public class CmsEvents {

if (topLevelContentValues != null) {
for (GenericValue point: topLevelContentValues) {
- int subContentStatusCode=verifySubContent(delegator, contentId, point.getString("contentId"));
- if (subContentStatusCode== HttpServletResponseWrapper.SC_OK) {
- return HttpServletResponseWrapper.SC_OK;
- } else if (subContentStatusCode== HttpServletResponseWrapper.SC_GONE) {
- hasContent=true;
+ int subContentStatusCode = verifySubContent(delegator, contentId, point.getString("contentId"));
+ if (subContentStatusCode == HttpServletResponse.SC_OK) {
+ return HttpServletResponse.SC_OK;
+ } else if (subContentStatusCode == HttpServletResponse.SC_GONE) {
+ hadContent = true;
}
}
}
}
- if (hasContent) return HttpServletResponseWrapper.SC_GONE;
- return HttpServletResponseWrapper.SC_NOT_FOUND;
+ if (hadContent) return HttpServletResponse.SC_GONE;
+ return HttpServletResponse.SC_NOT_FOUND;
}

protected static int verifySubContent(Delegator delegator, String contentId, String contentIdFrom) throws GeneralException {
- List<GenericValue> contentAssoc = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", contentIdFrom, "contentIdTo", contentId, "contentAssocTypeId", "SUB_CONTENT"));
- boolean hasContent=false;
+ List<GenericValue> contentAssoc = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentId", contentIdFrom, "contentIdTo", contentId, "contentAssocTypeId", "SUB_CONTENT"));
+ boolean hadContent = false;
if (UtilValidate.isNotEmpty(contentAssoc)) {
- hasContent=true;
+ hadContent = true;
}
contentAssoc = EntityUtil.filterByDate(contentAssoc);
if (UtilValidate.isEmpty(contentAssoc)) {
- List<GenericValue> assocs = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", contentIdFrom));
+ List<GenericValue> assocs = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentId", contentIdFrom));
assocs = EntityUtil.filterByDate(assocs);
if (assocs != null) {
- for (GenericValue assoc: assocs) {
- int subContentStatusCode=verifySubContent(delegator, contentId, assoc.getString("contentIdTo"));
- if (subContentStatusCode== HttpServletResponseWrapper.SC_OK) {
- return HttpServletResponseWrapper.SC_OK;
- } else if (subContentStatusCode== HttpServletResponseWrapper.SC_GONE) {
- hasContent=true;
+ for (GenericValue assoc : assocs) {
+ int subContentStatusCode = verifySubContent(delegator, contentId, assoc.getString("contentIdTo"));
+ if (subContentStatusCode == HttpServletResponse.SC_OK) {
+ return HttpServletResponse.SC_OK;
+ } else if (subContentStatusCode == HttpServletResponse.SC_GONE) {
+ hadContent = true;
}
}
}
} else {
if (Debug.verboseOn()) Debug.logVerbose("Found assocs: " + contentAssoc, module);
- return HttpServletResponseWrapper.SC_OK;
+ return HttpServletResponse.SC_OK;
}
- if (hasContent) return HttpServletResponseWrapper.SC_GONE;
- return HttpServletResponseWrapper.SC_NOT_FOUND;
+ if (hadContent) return HttpServletResponse.SC_GONE;
+ return HttpServletResponse.SC_NOT_FOUND;
}
}

Modified: ofbiz/branches/multitenant20100310/applications/content/template/HelpTemplate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/template/HelpTemplate.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/template/HelpTemplate.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/template/HelpTemplate.ftl Wed Mar 24 09:23:07 2010
@@ -44,7 +44,7 @@ under the License.
<#if first = "yes">
<h1>${subSection}</h1>
<#else>
- <br/><h2>${subSection}</h2>
+ <br /><h2>${subSection}</h2>
</#if>
<#elseif subSection?node_name = "para">
<p><@para para=subSection/></p>

Modified: ofbiz/branches/multitenant20100310/applications/content/template/survey/genericsurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/template/survey/genericsurvey.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/template/survey/genericsurvey.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/template/survey/genericsurvey.ftl Wed Mar 24 09:23:07 2010
@@ -163,11 +163,11 @@ under the License.
<input type="hidden" name="surveyId" value="${survey.surveyId}"/>

<h1>${survey.description?if_exists}</h1>
-<br/>
+<br />

<#if survey.comments?has_content>
<div class="tabletext">${survey.comments}</div>
-<br/>
+<br />
</#if>

<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -276,7 +276,7 @@ under the License.
<#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT">
<td colspan="5"><div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div></td>
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/>
- <td colspan="5"><hr/></td>
+ <td colspan="5"><hr /></td>
<#else/>
<#-- standard question options -->
<td align="right">

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/AdminSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/AdminSearch.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/AdminSearch.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/AdminSearch.ftl Wed Mar 24 09:23:07 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<hr/>
+<hr />
<form method="post" action="/content/control/AdminSearch" name="searchQuery" style="margin: 0;">
<table border="0" cellpadding="2" cellspacing="0">

@@ -121,7 +121,7 @@ under the License.
</form>

-<hr/>
+<hr />

<#macro listSiteIds contentId indentIndex=0>
<#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in listSiteIds, contentId:" + contentId,"")/>

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSContentEdit.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSContentEdit.ftl Wed Mar 24 09:23:07 2010
@@ -39,7 +39,7 @@ ${menuWrapper.renderMenuString()}
</td>
</tr>
</table>
-<br/>
+<br />

<#if currentValue?has_content>
@@ -54,7 +54,7 @@ ${menuWrapper.renderMenuString()}
-->
<#-- ============================================================= -->

-<br/>
+<br />
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<TR>
<TD width='100%'>
@@ -96,7 +96,7 @@ ${menuWrapper.renderMenuString()}
</TR>
</TABLE>

-<br/>
+<br />
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<TR>
<TD width='100%'>

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSSites.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSSites.ftl Wed Mar 24 09:23:07 2010
@@ -35,7 +35,7 @@ function call_fieldlookup4(rootForumId,
<#assign rootForumId=defaultSiteId?if_exists/>
</#if>
<@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_ADMIN" >
-<br/>
+<br />
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<TR>
<TD width='100%'>
@@ -84,9 +84,9 @@ function call_fieldlookup4(rootForumId,
<TR>
<TD width='100%'>
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr><td><hr/></td></tr>
+ <tr><td><hr /></td></tr>
<tr><td align="center"><h1>Unapproved entries for forum Id:${requestParameters.moderatedSiteId}</h1></td></tr>
- <tr><td><hr/></td></tr>
+ <tr><td><hr /></td></tr>
<@moderateSite rootForumId=rootForumId forumId=requestParameters.moderatedSiteId />
</TABLE>
</TD>
@@ -96,9 +96,9 @@ function call_fieldlookup4(rootForumId,
<TR>
<TD width='100%'>
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr><td><hr/></td></tr>
+ <tr><td><hr /></td></tr>
<tr><td align="center"><h1>Associated roles for forum Id:${requestParameters.permRoleSiteId}</h1></td></tr>
- <tr><td><hr/></td></tr>
+ <tr><td><hr /></td></tr>
<@grantSiteRoles rootForumId=rootForumId forumId=requestParameters.permRoleSiteId/>
</TABLE>
</TD>
@@ -178,11 +178,11 @@ function call_fieldlookup4(rootForumId,
<input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/>
<tr>
<td colspan="6" class="tabletext">
- <b>content:</b><br/>
+ <b>content:</b><br />
<@renderSubContentCache subContentId=content.contentId/>
</td>
</tr>
- <tr> <td colspan="5"> <hr/> </td> </tr>
+ <tr> <td colspan="5"> <hr /> </td> </tr>
<#assign row = row + 1/>
</@injectNodeTrailCsv >
</@checkPermission >

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/content/EditContentTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/content/EditContentTree.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/content/EditContentTree.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/content/EditContentTree.ftl Wed Mar 24 09:23:07 2010
@@ -20,16 +20,16 @@
<#assign content = delegator.findByPrimaryKey("Content",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",parameters.contentId))/>
<#if parameters.rename?has_content>
<div class="h3">${uiLabelMap.ContentRenameFolder}</div>
- ${uiLabelMap.ContentRenameFolder} : ${content.contentName}<br/>
+ ${uiLabelMap.ContentRenameFolder} : ${content.contentName}<br />
<input type="text" name="contentName" value="${content.contentName}">
<br/ <a class="buttontext" href="javascript:document.editContentTree.submit();">${uiLabelMap.ContentRenameFolder}</a><a class="buttontext" href="<@ofbizUrl>navigateContent</@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
<#else>
<div class="h3">${uiLabelMap.ContentNewFolder}</div>
${uiLabelMap.ContentRoot} : ${content.contentName}
<input type="text" name="contentName">
- <br/><a class="buttontext" href="javascript:document.editContentTree.submit();">${uiLabelMap.CommonCreate}</a><a class="buttontext" href="<@ofbizUrl>navigateContent</@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
+ <br /><a class="buttontext" href="javascript:document.editContentTree.submit();">${uiLabelMap.CommonCreate}</a><a class="buttontext" href="<@ofbizUrl>navigateContent</@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
</#if>
<input type="hidden" name="contentId" value="${parameters.contentId}"/>
<input type="hidden" name="contentAssocTypeId" value="TREE_CHILD"/>
</form>
-<hr/>
+<hr />

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/contentsetup/UserPermissions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/contentsetup/UserPermissions.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/contentsetup/UserPermissions.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/contentsetup/UserPermissions.ftl Wed Mar 24 09:23:07 2010
@@ -53,7 +53,7 @@ function call_fieldlookup3(view_name) {
</script>

<#-- ============================================================= -->
-<br/>
+<br />
<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<TR>
<TD width='100%'>

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/layout/renderSubContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/layout/renderSubContent.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/layout/renderSubContent.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/layout/renderSubContent.ftl Wed Mar 24 09:23:07 2010
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->

-<hr/>
+<hr />
<#if parameters.contentId?exists>
<#assign id=parameters.contentId/>
<@editRenderSubContent contentId="TEMPLATE_MASTER" mapKey="" editTemplate="true" subContentId=id?if_exists>

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl Wed Mar 24 09:23:07 2010
@@ -39,7 +39,7 @@
<td></td>
</tr>
<#if (arraySize > 0)>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
</table>
<table class="basic-table hover-bar" cellspacing="0">

Modified: ofbiz/branches/multitenant20100310/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Wed Mar 24 09:23:07 2010
@@ -236,7 +236,7 @@ under the License.
</div>
<div class="screenlet-body">
<a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion}</a>
- <br/><br/>
+ <br /><br />
${createSurveyQuestionCategoryWrapper.renderFormString(context)}
<#else>
<#if surveyQuestionId?has_content>
@@ -258,7 +258,7 @@ under the License.
<div class="screenlet-body">
</#if>
<a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion} ${uiLabelMap.ContentSurveryCategory}</a>
- <br/><br/>
+ <br /><br />
${createSurveyQuestionWrapper.renderFormString(context)}
</#if>
</div>

Modified: ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentForms.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentForms.xml Wed Mar 24 09:23:07 2010
@@ -630,4 +630,15 @@ under the License.
target="javascript:set_value('${contentId}')"/>
</field>
</form>
+ <form name="EditShowContentPortlet" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
+ <field name="contentId" entry-name="attributeMap.contentId">
+ <drop-down>
+ <entity-options description="${contentName}" entity-name="Content">
+ <entity-constraint name="contentTypeId" operator="equals" value="DOCUMENT"/>
+ <entity-order-by field-name="contentName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="saveButton"><submit/></field>
+ </form>
</forms>

Modified: ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentScreens.xml Wed Mar 24 09:23:07 2010
@@ -182,6 +182,16 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="ShowContentPortlet">
+ <section>
+ <actions>
+ <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
+ </actions>
+ <widgets>
+ <content content-id="${contentId}"/>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditDocumentTree">
<section>
<actions>

Modified: ofbiz/branches/multitenant20100310/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/humanres/entitydef/entitymodel.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/humanres/entitydef/entitymodel.xml Wed Mar 24 09:23:07 2010
@@ -436,7 +436,7 @@ under the License.
<field name="fromDate" type="date-time"/>
<field name="thruDate" type="date-time"/>
<field name="approverPartyId" type="id-ne"/>
- <field name="leaveStatus" type="short-varchar"/>
+ <field name="leaveStatus" type="short-varchar"/>
<field name="description" type="description"/>
<prim-key field="partyId"/>
<prim-key field="leaveTypeId"/>
@@ -452,7 +452,7 @@ under the License.
</relation>
<relation type="one" fk-name="EMPL_LEAVE_APPR" title="Approver" rel-entity-name="Party">
<key-map field-name="approverPartyId" rel-field-name="partyId"/>
- </relation>
+ </relation>
</entity>
<entity entity-name="EmplLeaveType"
package-name="org.ofbiz.humanres.employment"

Modified: ofbiz/branches/multitenant20100310/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Wed Mar 24 09:23:07 2010
@@ -70,7 +70,7 @@ under the License.
<tr><td><input type="hidden" name="groupName" value="${parameters.groupName?if_exists}"/></td></tr>
<tr><input type="hidden" name="roleTypeId" value="EMPLOYEE"/></tr>
<#if extInfo == "P">
- <tr><td colspan="3"><hr/></td></tr><tr>
+ <tr><td colspan="3"><hr /></td></tr><tr>
<td class="label">${uiLabelMap.CommonAddress1}</td>
<td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td>
</tr>
@@ -96,7 +96,7 @@ under the License.
</tr>
</#if>
<#if extInfo == "T">
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr><td class="label">${uiLabelMap.PartyCountryCode}</td>
<td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
</tr>
@@ -108,12 +108,12 @@ under the License.
</tr>
</#if>
<#if extInfo == "O">
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr><td class="label">${uiLabelMap.PartyContactInformation}</td>
<td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
</tr>
</#if>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr align="center">
<td> </td>
<td><input type="submit" value="${uiLabelMap.PartyLookupParty}" onClick="javascript:document.lookupparty.submit();"/>
@@ -133,7 +133,7 @@ under the License.
</script>
</#if>
<#if partyList?exists>
- <br/>
+ <br />
<div id="findEmployeeResults" class="screenlet">
<div class="screenlet-title-bar">
<ul>

Modified: ofbiz/branches/multitenant20100310/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/humanres/widget/GlobalHRSettingScreens.xml Wed Mar 24 09:23:07 2010
@@ -238,7 +238,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet id="AddEmplLeaveTypePanel" title="${uiLabelMap.HumanResAddEmplLeaveType}" collapsible="true">
<include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/GlobalHrSettingForms.xml"/>
</screenlet>

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml Wed Mar 24 09:23:07 2010
@@ -254,10 +254,16 @@ under the License.
<field field="productionRunHeader.estimatedStartDate" type="Timestamp"/>
<field field="productionRunHeader.estimatedCompletionDate" type="Timestamp"/>
</call-class-method>
+ <set field="taskTimeDifference" value="${originalProductionRunEstimatedTime - newProductionRunEstimatedTime}" type="Double"/>
<assert>
<if-compare-field field="productionRunHeader.estimatedStartDate" operator="equals" to-field="productionRunNewStartDate" type="Timestamp"/>
<if-compare-field field="productionRunTask.estimatedStartDate" operator="equals" to-field="productionRunNewStartDate" type="Timestamp"/>
- <if-compare-field field="originalProductionRunEstimatedTime" operator="equals" to-field="newProductionRunEstimatedTime" type="Double"/>
+ <or>
+ <if-compare field="taskTimeDifference" operator="equals" value="0.0" type="Double"/>
+ 
+ <if-compare field="taskTimeDifference" operator="equals" value="1.0" type="Double"/>
+ <if-compare field="taskTimeDifference" operator="equals" value="-1.0" type="Double"/>
+ </or>
</assert>

<check-errors/>

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java Wed Mar 24 09:23:07 2010
@@ -75,7 +75,7 @@ public class ProductionRunEvents {
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
- GenericPK key = GenericPK.create(delegator.getModelEntity("WorkEffortGoodStandard"), UtilMisc.toMap("workEffortId", (String)componentRow.get("productionRunTaskId"),
+ GenericPK key = delegator.makePK("WorkEffortGoodStandard", UtilMisc.toMap("workEffortId", (String)componentRow.get("productionRunTaskId"),
"productId", (String)componentRow.get("productId"),
"fromDate", fromDate,
"workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"));

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Wed Mar 24 09:23:07 2010
@@ -94,7 +94,7 @@ under the License.
</tr>
</#if>
</table>
- <br/>
+ <br />
<table class="basic-table" cellspacing="0">
<tr class="header-row">
<td width="18%">${uiLabelMap.ProductProductId}</td>

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Wed Mar 24 09:23:07 2010
@@ -37,8 +37,8 @@ function lookupBom() {
<#if product?has_content>
<a href="<@ofbizUrl>BomSimulation</@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}" class="buttontext">${uiLabelMap.ManufacturingBomSimulation}</a>
</#if>
- <br/>
- <br/>
+ <br />
+ <br />
<form name="searchform" action="<@ofbizUrl>UpdateProductBom</@ofbizUrl>#topform" method="post">
<input type="hidden" name="UPDATE_MODE" value=""/>

@@ -82,7 +82,7 @@ function lookupBom() {
</tr>
</table>
</form>
- <hr/>
+ <hr />
<form action="<@ofbizUrl>UpdateProductBom</@ofbizUrl>" method="post" name="editProductAssocForm">
<#if !(productAssoc?exists)>
<input type="hidden" name="UPDATE_MODE" value="CREATE"/>
@@ -316,7 +316,7 @@ function lookupBom() {
<#assign alt_row = !alt_row>
</#list>
</table>
- <br/>
+ <br />
${uiLabelMap.CommonNote}: <b class="alert">${uiLabelMap.CommonRed}</b> ${uiLabelMap.ManufacturingNote1} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote2} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote3}
</div>
</div>

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Wed Mar 24 09:23:07 2010
@@ -32,4 +32,4 @@ under the License.
</tr>
</table>
</#if>
- <br/>
\ No newline at end of file
+ <br />
\ No newline at end of file

Modified: ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Wed Mar 24 09:23:07 2010
@@ -150,7 +150,7 @@ document.lookupinventory.productId.focus
<td align="right">${uiLabelMap.ManufacturingTotalQuantity}</td>
</tr>
<tr>
- <td colspan="7"><hr/></td>
+ <td colspan="7"><hr /></td>
</tr>
<#assign count = lowIndex>
<#assign productTmp = "">
@@ -230,9 +230,9 @@ document.lookupinventory.productId.focus

</table>
<#else>
- <br/>
+ <br />
<div align="center">${uiLabelMap.CommonNoElementFound}</div>
- <br/>
+ <br />
</#if>
</#if>
</td>