Author: jleroux
Date: Sat Mar 23 08:27:30 2013
New Revision: 1460116
URL: http://svn.apache.org/r1460116
Log:
A patch from Jeremy Olmstead for "Unable to search accounting transaction
entries by productId " https://issues.apache.org/jira/browse/OFBIZ-5160
>From the FindAcctgTransEntries screen, enter a part number to search for...you
>will still get a complete list of all transactions because the form field name
>is produtId instead of productId. After searching relevant document types it
>turns out there are a few places where produtId is used instead of productId,
>the patch is meant to fix them all.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Mar
23 08:27:30 2013
@@ -18617,7 +18617,7 @@
<value xml:lang="zh">ç产è½å</value>
<value xml:lang="zh_TW">çç¢è½å</value>
</property>
- <property key="FormFieldTitle_produtId">
+ <property key="FormFieldTitle_productId">
<value xml:lang="de">Produkt ID</value>
<value xml:lang="en">Product Id</value>
<value xml:lang="es">Id Producto</value>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl
Sat Mar 23 08:27:30 2013
@@ -33,7 +33,7 @@ under the License.
<th>${uiLabelMap.FormFieldTitle_transTypeDescription}</th>
<th>${uiLabelMap.FormFieldTitle_invoiceId}</th>
<th>${uiLabelMap.FormFieldTitle_glAccountId}</th>
- <th>${uiLabelMap.FormFieldTitle_produtId}</th>
+ <th>${uiLabelMap.FormFieldTitle_productId}</th>
<th>${uiLabelMap.FormFieldTitle_debitCreditFlag}</th>
<th>${uiLabelMap.AccountingAmount}</th>
<th>${uiLabelMap.FormFieldTitle_origAmount}</th>
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sat Mar 23 08:27:30
2013
@@ -235,7 +235,7 @@ under the License.
</field>
<field name="invoiceId"><lookup target-form-name="LookupInvoice"
size="20" maxlength="20"/></field>
<field name="paymentId"><lookup target-form-name="LookupPayment"
size="20" maxlength="20"/></field>
- <field name="produtId"><lookup target-form-name="LookupProduct"
size="20" maxlength="20"/></field>
+ <field name="productId"><lookup target-form-name="LookupProduct"
size="20" maxlength="20"/></field>
<field name="workEffortId"><lookup target-form-name="LookupWorkEffort"
size="20" maxlength="20"/></field>
<field name="shipmentId"><lookup target-form-name="LookupShipment"
size="20" maxlength="20"/></field>
<field name="fromDate"><date-time/></field>
@@ -452,7 +452,7 @@ under the License.
</field>
<field name="invoiceId" position="1"><lookup
target-form-name="LookupInvoice" size="20" maxlength="20"/></field>
<field name="paymentId" position="2"><lookup
target-form-name="LookupPayment" size="20" maxlength="20"/></field>
- <field name="produtId" position="1"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
+ <field name="productId" position="1"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
<field name="workEffortId" position="2"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId" position="1"><lookup
target-form-name="LookupShipment" size="20" maxlength="20"/></field>
<field name="fixedAssetId" position="2">
@@ -540,7 +540,7 @@ under the License.
<sub-hyperlink
target="paymentOverview?paymentId=${acctgTrans.paymentId}"
description="${acctgTrans.paymentId}"/>
</lookup>
</field>
- <field name="produtId"><lookup target-form-name="LookupProduct"
size="20" maxlength="20"/></field>
+ <field name="productId"><lookup target-form-name="LookupProduct"
size="20" maxlength="20"/></field>
<field name="shipmentId"><lookup target-form-name="LookupShipment"
size="20" maxlength="20"/></field>
<field name="inventoryItemId"><text/></field>
<field name="groupStatusId"
title="${uiLabelMap.FormFieldTitle_groupStatus}">
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sat Mar 23
08:27:30 2013
@@ -102,7 +102,7 @@ under the License.
<link
text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext"
target="AcctgTransSearchResultsCsv.csv">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
@@ -117,7 +117,7 @@ under the License.
<link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransSearchResultPdf.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
@@ -163,7 +163,7 @@ under the License.
<screenlet
title="${uiLabelMap.AccountingAcctgTransEntries}
${uiLabelMap.AccountingByAccount}">
<link
text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext"
target="AcctgTransEntriesSearchResultsCsv.csv">
<parameter
param-name="organizationPartyId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
@@ -180,7 +180,7 @@ under the License.
</link>
<link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPdf.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
@@ -197,7 +197,7 @@ under the License.
</link>
<link
text="${uiLabelMap.AccountingExportWithInvoiceAndPaymentAsPdf}"
style="buttontext"
target="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf"
target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
@@ -227,7 +227,7 @@ under the License.
<screenlet
title="${uiLabelMap.AccountingAcctgTransEntries}
${uiLabelMap.AccountingByDate}">
<link
text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext"
target="AcctgTransEntriesSearchResultsCsv.csv">
<parameter
param-name="organizationPartyId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
@@ -244,7 +244,7 @@ under the License.
</link>
<link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPDF.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
- <parameter param-name="produtId"
from-field="parameters.produtId"/>
+ <parameter param-name="productId"
from-field="parameters.productId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
<parameter param-name="invoiceId"
from-field="parameters.invoiceId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
Modified:
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
(original)
+++
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
Sat Mar 23 08:27:30 2013
@@ -22,7 +22,7 @@ def module = "AcctgTransEntriesSearchRes
try {
def birtParameters = [:];
birtParameters.organizationPartyId = parameters.organizationPartyId;
- birtParameters.produtId = parameters.produtId;
+ birtParameters.productId = parameters.productId;
birtParameters.isPosted = parameters.isPosted;
birtParameters.invoiceId = parameters.invoiceId;
birtParameters.acctgTransId = parameters.acctgTransId;
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1460116&r1=1460115&r2=1460116&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Sat
Mar 23 08:27:30 2013
@@ -240,6 +240,7 @@ function setAlternateGwp(field) {
<#assign smallImageUrl =
Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(),
"SMALL_IMAGE_URL", locale, dispatcher)?if_exists />
<#if !smallImageUrl?string?has_content><#assign
smallImageUrl = "/images/defaultImage.jpg" /></#if>
<#if smallImageUrl?string?has_content>
+========================================1=================================================
<a href="<@ofbizCatalogAltUrl
productId=parentProductId/>">
<img
src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>"
alt="Product Image" class="imageborder" />
</a>
