You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by go...@apache.org on 2026/07/02 11:25:07 UTC
(ofbiz-framework) branch release24.09 updated (5b3cc9f615 -> ec65c5ad76)
This is an automated email from the ASF dual-hosted git repository.
golja pushed a change to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from 5b3cc9f615 Improved: Simplify handling of hidden fields in order search form
new a3909b1d4c Fixed: Add order type check for gift message display logic in order view screen
new 67ef1ef514 Fixed: Replace link with submit button for receiving purchase orders in OrderShippingInfo.ftl when a shipment has not been created yet
new 7c19b4e31e Fixed: Correct indentation in OrderShippingInfo.ftl
new daf6e11212 Fixed: Replace links with submit inputs in OrderShippingInfo.ftl for the 'Quick Receive Purchase Order' and 'Receive' actions displayed when a shipment has already been created
new ec65c5ad76 Improved: Apply common label and form alignment in the Receive Inventory screen and remove unnecessary colons from labels
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../order/template/order/OrderShippingInfo.ftl | 12 +++----
.../template/inventory/ReceiveInventory.ftl | 42 +++++++++++-----------
2 files changed, 27 insertions(+), 27 deletions(-)
(ofbiz-framework) 04/05: Fixed: Replace links with submit inputs in OrderShippingInfo.ftl for the 'Quick Receive Purchase Order' and 'Receive' actions displayed when a shipment has already been created
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit daf6e11212ee682daf1c68b9e2cbc7ef87906944
Author: Anahita Goljahani <an...@gmail.com>
AuthorDate: Thu Jun 25 20:30:01 2026 +0200
Fixed: Replace links with submit inputs in OrderShippingInfo.ftl for the 'Quick Receive Purchase Order' and 'Receive' actions displayed when a shipment has already been created
This commit alligns the 'Quick Receive Purchase Order' and 'Receive' buttons with the corresponding dropdown menus on the order view screen and makes their style consistent with the "Force Complete Purchase Order" button.
(cherry picked from commit f8a94512fd0dea22b9c78e8d2883476afdb199c4)
---
applications/order/template/order/OrderShippingInfo.ftl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl
index c75802420f..60418e42d0 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -94,7 +94,7 @@ under the License.
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
</select>
- <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonReceive}"</a>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonReceive}"/>
</form>
</li>
<#else>
@@ -107,8 +107,8 @@ under the License.
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
</select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"/>
</form>
- <a href="javascript:document.receiveInventoryForm.submit()" class="buttontext">${uiLabelMap.OrderQuickReceivePurchaseOrder}</a>
</li>
<li>
<form name="partialReceiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
@@ -120,8 +120,8 @@ under the License.
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
</select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonReceive}"/>
</form>
- <a href="javascript:document.partialReceiveInventoryForm.submit()" class="buttontext">${uiLabelMap.CommonReceive}</a>
</li>
</#if>
</#if>
(ofbiz-framework) 05/05: Improved: Apply common label and form alignment in the Receive Inventory screen and remove unnecessary colons from labels
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit ec65c5ad76196b275e04dcc82264a8622e724bd9
Author: Anahita Goljahani <an...@gmail.com>
AuthorDate: Tue Jun 30 12:00:25 2026 +0200
Improved: Apply common label and form alignment in the Receive Inventory screen and remove unnecessary colons from labels
(cherry picked from commit 29f29853a78ba53fabf3d2d720def27cd177ba9d)
---
.../template/inventory/ReceiveInventory.ftl | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/applications/product/template/inventory/ReceiveInventory.ftl b/applications/product/template/inventory/ReceiveInventory.ftl
index 555cc5787f..e92a29537f 100644
--- a/applications/product/template/inventory/ReceiveInventory.ftl
+++ b/applications/product/template/inventory/ReceiveInventory.ftl
@@ -414,18 +414,18 @@ under the License.
<#assign product = orderItem.getRelatedOne("Product", true)/>
<input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/>
<td width="45%">
- ${orderItem.orderItemSeqId}: <a href="<@ofbizUrl controlPath="/catalog/control">EditProduct?productId=${product.productId}</...@ofbizUrl>" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription!}</a> : ${product.description!}
+ ${orderItem.orderItemSeqId} -<a href="<@ofbizUrl controlPath="/catalog/control">EditProduct?productId=${product.productId}</...@ofbizUrl>" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription!}</a> ${product.description!}
</td>
<#else>
<td width="45%">
- <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription!}
+ <b>${orderItemType.get("description",locale)}</b> ${orderItem.itemDescription!}
<input type="text" size="12" name="productId_o_${rowCount}"/>
<a href="<@ofbizUrl controlPath="/catalog/control">EditProduct</...@ofbizUrl>" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</td>
</#if>
- <td align="right">${uiLabelMap.ProductLocation}:</td>
+ <td align="right">${uiLabelMap.ProductLocation}</td>
<#-- location(s) -->
- <td align="right">
+ <td align="left">
<#assign facilityLocations = (orderItem.getRelated("ProductFacilityLocation", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))!/>
<#if facilityLocations?has_content>
<select name="locationSeqId_o_${rowCount}">
@@ -446,14 +446,14 @@ under the License.
<@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/>
</#if>
</td>
- <td align="right">${uiLabelMap.ProductQtyAccepted} :</td>
- <td align="right">
+ <td align="right">${uiLabelMap.ProductQtyAccepted}</td>
+ <td align="left">
<input type="text" name="quantityAccepted_o_${rowCount}" size="6" value=<#if partialReceive??>"0"<#else>"${defaultQuantity?string.number}"</#if>/>
</td>
</tr>
<tr>
<td width="45%">
- ${uiLabelMap.ProductInventoryItemType} :
+ ${uiLabelMap.ProductInventoryItemType}
<#if product.inventoryItemTypeId?has_content>
<input name="inventoryItemTypeId_o_${rowCount}" type="hidden" value="${product.inventoryItemTypeId}" />
<#assign inventoryItemType = product.getRelatedOne("InventoryItemType", true)! />
@@ -470,8 +470,8 @@ under the License.
</select>
</#if>
</td>
- <td align="right">${uiLabelMap.ProductRejectionReason} :</td>
- <td align="right">
+ <td align="right">${uiLabelMap.ProductRejectionReason}</td>
+ <td align="left">
<select name="rejectionId_o_${rowCount}" size="1">
<option></option>
<#list rejectReasons as nextRejection>
@@ -479,39 +479,39 @@ under the License.
</#list>
</select>
</td>
- <td align="right">${uiLabelMap.ProductQtyRejected} :</td>
- <td align="right">
+ <td align="right">${uiLabelMap.ProductQtyRejected}</td>
+ <td align="left">
<input type="text" name="quantityRejected_o_${rowCount}" value="0" size="6"/>
</td>
<tr>
<td width="45%">
<#assign isSerialized = Static["org.apache.ofbiz.product.product.ProductWorker"].isSerialized(delegator, product.productId)!/>
<#if isSerialized?has_content>
- ${uiLabelMap.ProductSerialNumber} :
+ ${uiLabelMap.ProductSerialNumber}
<input type="text" name="serialNumber_o_${rowCount}" value="" />
</#if>
</td>
<#if !product.lotIdFilledIn?has_content || product.lotIdFilledIn != "Forbidden">
<td align="right">${uiLabelMap.ProductLotId}</td>
- <td align="right">
+ <td align="left">
<input type="text" name="lotId_o_${rowCount}" size="20" />
</td>
<#else>
<td align="right"> </td>
<td align="right"> </td>
</#if>
- <td align="right">${uiLabelMap.OrderQtyOrdered} :</td>
- <td align="right">
+ <td align="right">${uiLabelMap.OrderQtyOrdered}</td>
+ <td align="left">
<input type="text" class="inputBox" name="quantityOrdered" value="${orderItem.quantity}" size="6" maxlength="20" disabled="disabled" />
</td>
</tr>
</tr>
<tr>
- <td> </td>
- <td align="right">${uiLabelMap.ProductFacilityOwner}:</td>
- <td align="right"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td>
+ <td> </td>
+ <td align="right">${uiLabelMap.ProductFacilityOwner}</td>
+ <td align="left"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td>
<#if currencyUomId?default('') != orderCurrencyUomId?default('')>
- <td>${uiLabelMap.ProductPerUnitPriceOrder}:</td>
+ <td>${uiLabelMap.ProductPerUnitPriceOrder}</td>
<td>
<input type="hidden" name="orderCurrencyUomId_o_${rowCount}" value="${orderCurrencyUomId!}" />
<input type="text" id="orderCurrencyUnitPrice_${rowCount}" name="orderCurrencyUnitPrice_o_${rowCount}" value="${orderCurrencyUnitPriceMap[orderItem.orderItemSeqId]}" onchange="javascript:getConvertedPrice(orderCurrencyUnitPrice_${rowCount}, '${orderCurrencyUomId}', '${currencyUomId}', '${rowCount}', '${orderCurrencyUnitPriceMap[orderItem.orderItemSeqId]}', '${itemCost}');" size="6" maxlength="20" />
@@ -524,8 +524,8 @@ under the License.
${currencyUomId!}
</td>
<#else>
- <td align="right">${uiLabelMap.ProductPerUnitPrice}:</td>
- <td align="right">
+ <td align="right">${uiLabelMap.ProductPerUnitPrice}</td>
+ <td align="left">
<input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId!}" />
<input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20" />
${currencyUomId!}
(ofbiz-framework) 01/05: Fixed: Add order type check for gift message display logic in order view screen
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit a3909b1d4cbc2d63ac56501d989d0c2b5516053b
Author: Anahita Goljahani <an...@gmail.com>
AuthorDate: Mon Jun 22 18:13:01 2026 +0200
Fixed: Add order type check for gift message display logic in order view screen
The commit hides gift-related information on the order view page for 'purchase' orders, as it is not relevant.
(cherry picked from commit 17cce1c6c09ca07537185bc4b0b1e71e5229d446)
---
applications/order/template/order/OrderShippingInfo.ftl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl
index c0a92a0275..cbad6a256c 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -687,8 +687,8 @@ under the License.
</#if>
</td>
</tr>
-
- <#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
+
+ <#if orderHeader?has_content && "PURCHASE_ORDER" != orderHeader.orderTypeId && shipGroup.isGift?has_content && noShipment?default("false") != "true">
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td class="label">
(ofbiz-framework) 03/05: Fixed: Correct indentation in OrderShippingInfo.ftl
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 7c19b4e31e12666c1b6bd33ada035d21a569f2ac
Author: Anahita Goljahani <an...@gmail.com>
AuthorDate: Mon Jun 22 20:08:21 2026 +0200
Fixed: Correct indentation in OrderShippingInfo.ftl
(cherry picked from commit aba729ddcd015a319c1cd792d29811840f83456a)
---
applications/order/template/order/OrderShippingInfo.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl
index 55c81bd1ac..c75802420f 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -95,7 +95,7 @@ under the License.
</#list>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonReceive}"</a>
- </form>
+ </form>
</li>
<#else>
<li>
(ofbiz-framework) 02/05: Fixed: Replace link with submit button for receiving purchase orders in OrderShippingInfo.ftl when a shipment has not been created yet
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 67ef1ef514008f36a6660cb21cabbadbc27da68b
Author: Anahita Goljahani <an...@gmail.com>
AuthorDate: Mon Jun 22 20:06:14 2026 +0200
Fixed: Replace link with submit button for receiving purchase orders in OrderShippingInfo.ftl when a shipment has not been created yet
This commit aligns the 'Receive' button on the order view screen with the dropdown menu and makes its style consistent with the 'Quick Receive Purchase Order' button.
(cherry picked from commit fe294798ff02eb6c1bb5fba6585fdb46ea9b755d)
---
applications/order/template/order/OrderShippingInfo.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl
index cbad6a256c..55c81bd1ac 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -94,8 +94,8 @@ under the License.
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
</select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonReceive}"</a>
</form>
- <a href="javascript:document.receivePurchaseOrderForm.submit()" class="buttontext">${uiLabelMap.CommonReceive}</a>
</li>
<#else>
<li>