You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2017/07/22 11:51:08 UTC
svn commit: r1802677 - in /ofbiz/branches/release16.11: ./
applications/product/widget/catalog/ProductForms.xml
Author: arunpatidar
Date: Sat Jul 22 11:51:08 2017
New Revision: 1802677
URL: http://svn.apache.org/viewvc?rev=1802677&view=rev
Log:
Applied fix from trunk for revision: 1801262
===
Fixed: Required check missing for supplier product id and last price on Add Product Supplier page (OFBIZ-9455).
Thanks Aditya Sharma for reporting and providing patch.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 22 11:51:08 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801274,1801303,1801336,1801340,1801359,1801742,1802657
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262,1801274,1801303,1801336,1801340,1801359,1801742,1802657
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml?rev=1802677&r1=1802676&r2=1802677&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml Sat Jul 22 11:51:08 2017
@@ -940,12 +940,14 @@ under the License.
</entity-options>
</drop-down>
</field>
+ <field name="supplierProductId" title="${uiLabelMap.FormFieldTitle_supplierProductId}" required-field="true"></field>
<field name="canDropShip" title="${uiLabelMap.ProductSupplierCanDropShip}">
<drop-down allow-empty="false" no-current-selected-key="N">
<option key="Y" description="${uiLabelMap.CommonY}"/>
<option key="N" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
+ <field name="lastPrice" title="${uiLabelMap.FormFieldTitle_lastPrice}" required-field="true"></field>
<field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
<field use-when="supplierProduct != null" name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>