Author: deepak
Date: Wed Jun 1 11:11:51 2016
New Revision: 1746426
URL: http://svn.apache.org/viewvc?rev=1746426&view=rev
Log:
(OFBIZ-7079) Manually merged r#1745592 and r#1746422
=======================================================
Extend Product entity and add serialized field
Thanks Avnindra for your patch.
=======================================================
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/datamodel/entitydef/product-entitymodel.xml
ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java
ofbiz/branches/release15.12/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/branches/release15.12/applications/product/webapp/facility/returns/receiveReturn.ftl
ofbiz/branches/release15.12/applications/product/widget/catalog/ProductForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 11:11:51 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745751,1746228
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422
Modified:
ofbiz/branches/release15.12/applications/datamodel/entitydef/product-entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/datamodel/entitydef/product-entitymodel.xml?rev=1746426&r1=1746425&r2=1746426&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/datamodel/entitydef/product-entitymodel.xml
(original)
+++
ofbiz/branches/release15.12/applications/datamodel/entitydef/product-entitymodel.xml
Wed Jun 1 11:11:51 2016
@@ -2716,6 +2716,7 @@ under the License.
<field name="originalImageUrl" type="url"></field>
<field name="detailScreen" type="long-varchar"></field>
<field name="inventoryMessage" type="description"></field>
+ <field name="inventoryItemTypeId" type="id"></field>
<field name="requireInventory" type="indicator"></field>
<field name="quantityUomId" type="id"></field>
<field name="quantityIncluded" type="fixed-point"><description>If you
have a six-pack of 12oz soda cans you would have quantityIncluded=12,
quantityUomId=oz, piecesIncluded=6.</description></field>
@@ -2823,6 +2824,10 @@ under the License.
<relation type="one" fk-name="PROD_SHBX_TYPE" title="Default"
rel-entity-name="ShipmentBoxType">
<key-map field-name="defaultShipmentBoxTypeId"
rel-field-name="shipmentBoxTypeId"/>
</relation>
+ <relation type="one" fk-name="PROD_INV_ITEM_TYPE"
rel-entity-name="InventoryItemType">
+ <key-map field-name="inventoryItemTypeId"
rel-field-name="inventoryItemTypeId"/>
+ </relation>
+
</entity>
<entity entity-name="ProductAssoc"
package-name="org.ofbiz.product.product"
Modified:
ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1746426&r1=1746425&r2=1746426&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java
(original)
+++
ofbiz/branches/release15.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java
Wed Jun 1 11:11:51 2016
@@ -131,6 +131,17 @@ public class ProductWorker {
}
return false;
}
+ public static boolean isSerialized (Delegator delegator, String productId)
{
+ try {
+ GenericValue product =
EntityQuery.use(delegator).from("Product").where("productId",
productId).cache().queryOne();
+ if (UtilValidate.isNotEmpty(product)) {
+ return
"SERIALIZED_INV_ITEM".equals(product.getString("inventoryItemTypeId"));
+ }
+ } catch (GenericEntityException e) {
+ Debug.logWarning(e.getMessage(), module);
+ }
+ return false;
+ }
public static boolean taxApplies(GenericValue product) {
String errMsg = "";
Modified:
ofbiz/branches/release15.12/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1746426&r1=1746425&r2=1746426&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/product/webapp/facility/inventory/receiveInventory.ftl
(original)
+++
ofbiz/branches/release15.12/applications/product/webapp/facility/inventory/receiveInventory.ftl
Wed Jun 1 11:11:51 2016
@@ -137,7 +137,12 @@ under the License.
<td width="6%" align="right" nowrap="nowrap"
class="label">${uiLabelMap.ProductInventoryItemType}</td>
<td width="6%"> </td>
<td width="74%">
- <select name="inventoryItemTypeId" size="1">
+ <#if product.inventoryItemTypeId?has_content>
+ <input name="inventoryItemTypeId" type="hidden"
value="${product.inventoryItemTypeId}" />
+ <#assign inventoryItemType =
product.getRelatedOne("InventoryItemType", true)! />
+ ${inventoryItemType.description!}
+ <#else>
+ <select name="inventoryItemTypeId" size="1">
<#list inventoryItemTypes as nextInventoryItemType>
<option
value="${nextInventoryItemType.inventoryItemTypeId}"
<#if (facility.defaultInventoryItemTypeId?has_content)
&& (nextInventoryItemType.inventoryItemTypeId ==
facility.defaultInventoryItemTypeId)>
@@ -146,9 +151,21 @@ under the License.
>${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
+ </#if>
</td>
</tr>
- <tr>
+ <#assign isSeriazed =
Static["org.ofbiz.product.product.ProductWorker"].isSerialized(delegator,
product.productId)!/>
+ <#if isSeriazed?has_content>
+ <tr>
+ <td width="14%"> </td>
+ <td width="6%" align="right" nowrap="nowrap"
class="label">${uiLabelMap.ProductSerialNumber}</td>
+ <td width="6%"> </td>
+ <td width="74%">
+ <input type="text" name="serialNumber"
value="${parameters.serialNumber!}" />
+ </td>
+ </tr>
+ </#if>
+ <tr>
<td colspan="4"> </td>
</tr>
<tr>
@@ -437,7 +454,12 @@ under the License.
<tr>
<td width="45%">
${uiLabelMap.ProductInventoryItemType} :
- <select name="inventoryItemTypeId_o_${rowCount}"
size="1">
+ <#if product.inventoryItemTypeId?has_content>
+ <input name="inventoryItemTypeId_o_${rowCount}"
type="hidden" value="${product.inventoryItemTypeId}" />
+ <#assign inventoryItemType =
product.getRelatedOne("InventoryItemType", true)! />
+ ${inventoryItemType.description!}
+ <#else>
+ <select name="inventoryItemTypeId_o_${rowCount}" size="1">
<#list inventoryItemTypes as
nextInventoryItemType>
<option
value="${nextInventoryItemType.inventoryItemTypeId}"
<#if
(facility.defaultInventoryItemTypeId?has_content) &&
(nextInventoryItemType.inventoryItemTypeId ==
facility.defaultInventoryItemTypeId)>
@@ -446,6 +468,7 @@ under the License.
>${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
+ </#if>
</td>
<td
align="right">${uiLabelMap.ProductRejectionReason} :</td>
<td align="right">
@@ -461,13 +484,19 @@ under the License.
<input type="text"
name="quantityRejected_o_${rowCount}" value="0" size="6"/>
</td>
<tr>
- <td> </td>
- <#if !product.lotIdFilledIn?has_content ||
product.lotIdFilledIn != "Forbidden">
+ <td width="45%">
+ <#assign isSeriazed =
Static["org.ofbiz.product.product.ProductWorker"].isSerialized(delegator,
product.productId)!/>
+ <#if isSeriazed?has_content>
+ ${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">
<input type="text" name="lotId_o_${rowCount}"
size="20" />
</td>
- <#else />
+ <#else>
<td align="right"> </td>
<td align="right"> </td>
</#if>
Modified:
ofbiz/branches/release15.12/applications/product/webapp/facility/returns/receiveReturn.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1746426&r1=1746425&r2=1746426&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/product/webapp/facility/returns/receiveReturn.ftl
(original)
+++
ofbiz/branches/release15.12/applications/product/webapp/facility/returns/receiveReturn.ftl
Wed Jun 1 11:11:51 2016
@@ -167,7 +167,12 @@ under the License.
</tr>
<tr>
<td width='10%'>
- <select name="inventoryItemTypeId_o_${rowCount}"
size="1" id="inventoryItemTypeId_o_${rowCount}"
onchange="javascript:setInventoryItemStatus(this,${rowCount});">
+ <#if product.inventoryItemTypeId?has_content>
+ <input name="inventoryItemTypeId_o_${rowCount}"
type="hidden" value="${product.inventoryItemTypeId}" />
+ <#assign inventoryItemType =
product.getRelatedOne("InventoryItemType", true)! />
+ ${inventoryItemType.description!}
+ <#else>
+ <select
name="inventoryItemTypeId_o_${rowCount}" size="1"
id="inventoryItemTypeId_o_${rowCount}"
onchange="javascript:setInventoryItemStatus(this,${rowCount});">
<#list inventoryItemTypes as
nextInventoryItemType>
<option
value='${nextInventoryItemType.inventoryItemTypeId}'
<#if
(facility.defaultInventoryItemTypeId?has_content) &&
(nextInventoryItemType.inventoryItemTypeId ==
facility.defaultInventoryItemTypeId)>
@@ -175,7 +180,8 @@ under the License.
</#if>
>${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
- </select>
+ </select>
+ </#if>
</td>
<td width="35%">
<span
class="label">${uiLabelMap.ProductInitialInventoryItemStatus}:</span>
Modified:
ofbiz/branches/release15.12/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/widget/catalog/ProductForms.xml?rev=1746426&r1=1746425&r2=1746426&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/release15.12/applications/product/widget/catalog/ProductForms.xml
Wed Jun 1 11:11:51 2016
@@ -122,6 +122,16 @@ under the License.
<drop-down allow-empty="true"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="inventoryMessage"
title="${uiLabelMap.ProductInventoryMessage}"><text size="20"
maxlength="255"/></field>
+ <field name="inventoryItemTypeId"
title="${uiLabelMap.ProductInventoryItemTypeId}" use-when="product==null">
+ <drop-down allow-empty="false" >
+ <entity-options entity-name="InventoryItemType"
key-field-name="inventoryItemTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="inventoryItemTypeId"
title="${uiLabelMap.ProductInventoryItemTypeId}" use-when="product!=null">
+ <display-entity entity-name="InventoryItemType"/>
+ </field>
<field name="lotIdFilledIn" title="${uiLabelMap.ProductLotId}">
<drop-down allow-empty="false">
@@ -296,6 +306,7 @@ under the License.
<field-group title="${uiLabelMap.CommonInventory}"
collapsible="true" initially-collapsed="true">
<sort-field name="salesDiscWhenNotAvail"/>
<sort-field name="requirementMethodEnumId"/>
+ <sort-field name="inventoryItemTypeId"/>
<sort-field name="requireInventory"/>
<sort-field name="inventoryMessage"/>
<sort-field name="lotIdFilledIn"/>
