svn commit: r1746434 - in /ofbiz/branches/release14.12: ./ applications/product/entitydef
Locked
svn commit: r1746434 - in /ofbiz/branches/release14.12: ./ applications/product/entitydef
 
|
Author: deepak
Date: Wed Jun 1 11:23:18 2016 New Revision: 1746434 URL: http://svn.apache.org/viewvc?rev=1746434&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/release14.12/ (props changed) ofbiz/branches/release14.12/applications/product/entitydef/entitymodel.xml ofbiz/branches/release14.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/release14.12/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/release14.12/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/branches/release14.12/applications/product/widget/catalog/ProductForms.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 1 11:23:18 2016 @@ -8,5 +8,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/branches/release15.12:1745714 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744911,1745111,1745264,1745428,1745438,1745573,1746228 +/ofbiz/branches/release15.12:1745714,1746426 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422 Modified: ofbiz/branches/release14.12/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/entitydef/entitymodel.xml?rev=1746434&r1=1746433&r2=1746434&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release14.12/applications/product/entitydef/entitymodel.xml Wed Jun 1 11:23:18 2016 @@ -2717,6 +2717,7 @@ under the License. <field name="detailScreen" type="long-varchar"></field> <field name="inventoryMessage" type="description"></field> <field name="requireInventory" type="indicator"></field> + <field name="inventoryItemTypeId" type="id"></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> <field name="piecesIncluded" type="numeric"></field> @@ -2823,6 +2824,9 @@ 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/release14.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1746434&r1=1746433&r2=1746434&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/branches/release14.12/applications/product/src/org/ofbiz/product/product/ProductWorker.java Wed Jun 1 11:23:18 2016 @@ -133,6 +133,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/release14.12/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1746434&r1=1746433&r2=1746434&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/branches/release14.12/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Jun 1 11:23:18 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/release14.12/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1746434&r1=1746433&r2=1746434&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/branches/release14.12/applications/product/webapp/facility/returns/receiveReturn.ftl Wed Jun 1 11:23:18 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/release14.12/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/widget/catalog/ProductForms.xml?rev=1746434&r1=1746433&r2=1746434&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/release14.12/applications/product/widget/catalog/ProductForms.xml Wed Jun 1 11:23:18 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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |