Commit cef68231 authored by spawar's avatar spawar

Added limited edition, brand, stop buy and size grid short description


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99555 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2a0a597f
...@@ -117,6 +117,12 @@ ...@@ -117,6 +117,12 @@
<xsl:variable name="pur_lead_time"><xsl:value-of select="pur_lead_time"/></xsl:variable> <xsl:variable name="pur_lead_time"><xsl:value-of select="pur_lead_time"/></xsl:variable>
<xsl:variable name="location_descr"><xsl:value-of select="location_descr"/></xsl:variable> <xsl:variable name="location_descr"><xsl:value-of select="location_descr"/></xsl:variable>
<xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!-- Added by Parikshit Kumbhar on 08/07/2015 [to set date format] --> <xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!-- Added by Parikshit Kumbhar on 08/07/2015 [to set date format] -->
<!-- Added by Samadhan on 21/12/2015 [to set Size Discription Grid, limited edition,brand, brand descr] start -->
<xsl:variable name="item_phy_attrib_6"><xsl:value-of select="item_phy_attrib_6"/></xsl:variable><!--size sh descr-->
<xsl:variable name="item_usage_type"><xsl:value-of select="item_usage_type"/></xsl:variable><!--limited edition-->
<xsl:variable name="item_phy_attrib_24"><xsl:value-of select="item_phy_attrib_24"/></xsl:variable><!--brand code-->
<xsl:variable name="brand_descr"><xsl:value-of select="brand_descr"/></xsl:variable><!--brand descr-->
<!-- Added by Samadhan on 21/12/2015 [to set Size Discription Grid, limited edition,brand, brand descr] start -->
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
...@@ -446,6 +452,33 @@ ...@@ -446,6 +452,33 @@
</td> </td>
</tr> </tr>
<!--Changed by Samadhan on 22/12/2015 for brand availability Start-->
<tr>
<td class="td_leftAlign" nowrap="true" valign="top">
<strong>Brand* :</strong><!--Changed by Parikshit Kumbhar on 22/06/2015 [D15CKAT031] [* added] -->
</td>
<td class="td_leftAlign" colspan="3">
<div style="position:relative; width: 100%;">
<div id="brand_descr" class="editDivClass" contenteditable="true" onkeypress="return false;"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','item_phy_attrib_24', 'Brand', 0);">
</div>
<div style="width:3%; float: right">
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($login_code)}','item_phy_attrib_24', 'Brand', 0);"
style="float: left;text-decoration: none;">
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Color Codes" />
</a>
</div>
</div>
<input type="hidden" class="editInputClass" value="{$item_phy_attrib_24}" name="Detail1.{normalize-space($dbID)}.item_phy_attrib_24"
id="Detail1.{normalize-space($dbID)}.item_phy_attrib_24" maxlength="10" ISCHANGED="false" readOnly = "1"/>
<input type="hidden" class="editInputClass" value="{$brand_descr}" name="Detail1.{normalize-space($dbID)}.brand_descr"
id="Detail1.{normalize-space($dbID)}.brand_descr" maxlength="10"/>
</td>
</tr>
<!--Changed by Samadhan on 22/12/2015 for brand availability End-->
<!-- Added by Chetan Mahajan on date:05/02/2015. Starts.. --> <!-- Added by Chetan Mahajan on date:05/02/2015. Starts.. -->
<tr> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign" nowrap="true">
...@@ -610,6 +643,36 @@ ...@@ -610,6 +643,36 @@
<!--Added by parikshit Kumbhar on 27/04/2015 [to take value of size_type_desc ] end--> <!--Added by parikshit Kumbhar on 27/04/2015 [to take value of size_type_desc ] end-->
</td> </td>
<!-- Added By Samadhan on 21/12/2015 for Limited Edition Start -->
<td class="td_rightAlign" colspan="2">
<strong>Limited Edition :</strong>
<select name="Detail1.{normalize-space($dbID)}.item_usage_type" id="item_usage_type" >
<xsl:choose>
<xsl:when test="$item_usage_type ='N'">
<option value="N" selected="selected" >No </option>
</xsl:when>
<xsl:otherwise>
<option value="N" >No </option>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="$item_usage_type ='Y'">
<option value="Y" selected="selected" >Yes </option>
</xsl:when>
<xsl:otherwise>
<option value="Y" >Yes </option>
</xsl:otherwise>
</xsl:choose>
</select>
</td>
<!-- Added By Samadhan on 21/12/2015 for Limited Edition End -->
</tr> </tr>
<tr style="height: 10px;"> <tr style="height: 10px;">
......
...@@ -173,6 +173,12 @@ ...@@ -173,6 +173,12 @@
<xsl:variable name="item_commodity"><xsl:value-of select="item_commodity"/></xsl:variable> <xsl:variable name="item_commodity"><xsl:value-of select="item_commodity"/></xsl:variable>
<xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!--Added by parikshit kumbhar on 08/07/2015[to set date format] --> <xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!--Added by parikshit kumbhar on 08/07/2015[to set date format] -->
<!--Added by Parikshit on 20-APR-2015 Ends --> <!--Added by Parikshit on 20-APR-2015 Ends -->
<!-- Added by Samadhan on 21/12/2015 [to set Size Discription Grid, limited edition,brand, brand descr] start -->
<xsl:variable name="item_usage_type"><xsl:value-of select="item_usage_type"/></xsl:variable><!--limited edition-->
<xsl:variable name="item_phy_attrib_24"><xsl:value-of select="item_phy_attrib_24"/></xsl:variable><!--brand code-->
<xsl:variable name="brand_descr"><xsl:value-of select="brand_descr"/></xsl:variable><!--brand descr-->
<!-- Added by Samadhan on 21/12/2015 [to set Size Discription Grid, limited edition,brand, brand descr] start -->
<xsl:if test="$dbID = '0'"> <xsl:if test="$dbID = '0'">
...@@ -272,6 +278,11 @@ ...@@ -272,6 +278,11 @@
<input type="hidden" value="{$item_commodity}" name="Detail2.{normalize-space($dbID)}.item_commodity" id="item_commodity" /> <input type="hidden" value="{$item_commodity}" name="Detail2.{normalize-space($dbID)}.item_commodity" id="item_commodity" />
<input type="hidden" value="{$date_format}" name="Detail2.{normalize-space($dbID)}.date_format" id="date_format" /><!--Added by parikshit on 08/07/15 to set date format --> <input type="hidden" value="{$date_format}" name="Detail2.{normalize-space($dbID)}.date_format" id="date_format" /><!--Added by parikshit on 08/07/15 to set date format -->
<!--Added by Parikshit on 20-APR-2015 Ends --> <!--Added by Parikshit on 20-APR-2015 Ends -->
<!--Added by Samadhan on 21/12/2015 for Limited Edition field start-->
<input type="hidden" value="{item_usage_type}" name="Detail2.{normalize-space($dbID)}.item_usage_type" id="item_usage_type" />
<input type="hidden" value="{item_phy_attrib_24}" name="Detail2.{normalize-space($dbID)}.item_phy_attrib_24" id="item_phy_attrib_24" />
<input type="hidden" value="{brand_descr}" name="Detail2.{normalize-space($dbID)}.brand_descr" id="brand_descr" />
<!--Added by Samadhan on 21/12/2015 for Limited Edition field start-->
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:for-each>
...@@ -372,6 +383,9 @@ ...@@ -372,6 +383,9 @@
<input type="hidden" class="editInputClass" value="{$phy_att1}" name="Detail2.{normalize-space($dbIDs)}.phy_att1" <input type="hidden" class="editInputClass" value="{$phy_att1}" name="Detail2.{normalize-space($dbIDs)}.phy_att1"
id="Detail2.{normalize-space($dbIDs)}.phy_att1" maxlength="10"/> id="Detail2.{normalize-space($dbIDs)}.phy_att1" maxlength="10"/>
<xsl:value-of select="phy_att1"/> <xsl:value-of select="phy_att1"/>
</td> </td>
<td onclick="chkProdDescRows('Detail2.{normalize-space($dbIDs)}.selectbox')"> <td onclick="chkProdDescRows('Detail2.{normalize-space($dbIDs)}.selectbox')">
......
...@@ -106,6 +106,12 @@ function setActionVal( value ) ...@@ -106,6 +106,12 @@ function setActionVal( value )
<xsl:variable name="pur_lead_time"><xsl:value-of select="pur_lead_time"/></xsl:variable> <xsl:variable name="pur_lead_time"><xsl:value-of select="pur_lead_time"/></xsl:variable>
<xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!-- Added by parikshit kumbhar on 08/07/15 [to set date format] --> <xsl:variable name="date_format"><xsl:value-of select="date_format"/></xsl:variable><!-- Added by parikshit kumbhar on 08/07/15 [to set date format] -->
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase start-->
<xsl:variable name="usage_type"><xsl:value-of select="usage_type"/></xsl:variable><!--limited edition-->
<xsl:variable name="stop_purchase"><xsl:value-of select="stop_purchase"/></xsl:variable><!--Stop purchase-->
<xsl:variable name="phy_attrib_24"><xsl:value-of select="phy_attrib_24"/></xsl:variable><!--brand code-->
<xsl:variable name="brand_descr"><xsl:value-of select="brand_descr"/></xsl:variable><!--brand descr-->
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase end-->
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
...@@ -289,6 +295,35 @@ function setActionVal( value ) ...@@ -289,6 +295,35 @@ function setActionVal( value )
</td> </td>
</tr> </tr>
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase start-->
<tr>
<td class="td_leftAlign" nowrap="true">
<strong>Brand :</strong>
</td>
<td class="td_leftAlign">
<div style="position:relative; width: 88%;">
<input type="text" class="editInputClass" value="{$phy_attrib_24}" name="Detail2.{normalize-space($dbID)}.phy_attrib_24"
id="Detail2.{normalize-space($dbID)}.phy_attrib_24" maxlength="10" ISCHANGED="false" readOnly = "1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','phy_attrib_24', 'Brand', 0);"
style="width: 95%;"/>
<div style="width:3%; float: right;">
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($login_code)}','phy_attrib_24', 'Brand', 0);"
style="float: left;text-decoration: none;">
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Location Code" />
</a>
</div>
</div>
</td>
<td colspan="2">
<input type="text" name="Detail2.{normalize-space($dbID)}.brand_descr" id="Detail2.{normalize-space($dbID)}.brand_descr"
value="{brand_descr}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 100%" />
<input type="hidden" value="{$phy_attrib_24}" name="Detail2.{normalize-space($dbID)}.phy_attrib_24"
id="Detail2.{normalize-space($dbID)}.phy_attrib_24" maxlength="10"/>
</td>
</tr>
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase start-->
<tr> <tr>
<td class="td_leftAlign" nowrap="true" style="width:20%;"> <td class="td_leftAlign" nowrap="true" style="width:20%;">
<strong>Purchase Lead Time :</strong> <strong>Purchase Lead Time :</strong>
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
colModal: [ colModal: [
{ width: 100, align: 'center' }, { width: 100, align: 'center' },
{ width: 300, align: 'left' }, { width: 300, align: 'left' },
{ width: 90, align: 'center' },
{ width: 90, align: 'center' },
{ width: 110, align: 'left' }, { width: 110, align: 'left' },
{ width: 150, align: 'left' }, { width: 150, align: 'left' },
{ width: 150, align: 'left' }, { width: 150, align: 'left' },
...@@ -105,6 +107,8 @@ ...@@ -105,6 +107,8 @@
<!-- <th><input type='checkbox' id='Detail3.0.selectbox' onclick='checkAllSKUItem(this)' checked='1'/></th> --> <!-- <th><input type='checkbox' id='Detail3.0.selectbox' onclick='checkAllSKUItem(this)' checked='1'/></th> -->
<th>Item&#160;Code</th> <th>Item&#160;Code</th>
<th>Item&#160;Description</th> <th>Item&#160;Description</th>
<th>Limited&#160;Edi.</th>
<th>Stop&#160;buy</th>
<th>Size</th> <th>Size</th>
<th>Colour</th> <th>Colour</th>
<th>Fitting</th> <th>Fitting</th>
...@@ -163,6 +167,11 @@ ...@@ -163,6 +167,11 @@
<xsl:variable name="language"><xsl:value-of select="language"/></xsl:variable> <xsl:variable name="language"><xsl:value-of select="language"/></xsl:variable>
<xsl:variable name="language_desc"><xsl:value-of select="language_desc"/></xsl:variable> <xsl:variable name="language_desc"><xsl:value-of select="language_desc"/></xsl:variable>
<xsl:variable name="language_dtl"><xsl:value-of select="language_dtl"/></xsl:variable> <xsl:variable name="language_dtl"><xsl:value-of select="language_dtl"/></xsl:variable>
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase start-->
<xsl:variable name="usage_type"><xsl:value-of select="usage_type"/></xsl:variable> <!--limited edition-->
<xsl:variable name="catalog_no"><xsl:value-of select="catalog_no"/></xsl:variable> <!--Stop purchase-->
<!--added by samadhan on 23/12/2015 for brand,limited edition and stop purchase end-->
<xsl:if test="$dbIDs > '0'"> <xsl:if test="$dbIDs > '0'">
<tr> <tr>
<td> <td>
...@@ -187,6 +196,52 @@ ...@@ -187,6 +196,52 @@
id="Detail3.{normalize-space($dbIDs)}.item_code" maxlength="10" style="width: 100%"/> id="Detail3.{normalize-space($dbIDs)}.item_code" maxlength="10" style="width: 100%"/>
</td> </td>
<!-- Added By Samadhan on 21/12/2015 for Limited Edition Start -->
<td>
<select name="Detail3.{normalize-space($dbIDs)}.usage_type" id="usage_type" >
<xsl:choose>
<xsl:when test="$usage_type ='N'">
<option value="N" selected="selected" >No </option>
</xsl:when>
<xsl:otherwise>
<option value="N" >No </option>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="$usage_type ='Y'">
<option value="Y" selected="selected" >Yes </option>
</xsl:when>
<xsl:otherwise>
<option value="Y" >Yes </option>
</xsl:otherwise>
</xsl:choose>
</select>
</td>
<td>
<select name="Detail3.{normalize-space($dbIDs)}.catalog_no" id="catalog_no" >
<xsl:choose>
<xsl:when test="$catalog_no ='N'">
<option value="N" selected="selected" >No </option>
</xsl:when>
<xsl:otherwise>
<option value="N" >No </option>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="$catalog_no ='Y'">
<option value="Y" selected="selected" >Yes </option>
</xsl:when>
<xsl:otherwise>
<option value="Y" >Yes </option>
</xsl:otherwise>
</xsl:choose>
</select>
</td>
<!-- Added By Samadhan on 21/12/2015 for Limited Edition End -->
<td> <td>
<input type="hidden" class="editInputClass" value="{$phy_attrib_1}" name="Detail3.{normalize-space($dbIDs)}.phy_attrib_1" <input type="hidden" class="editInputClass" value="{$phy_attrib_1}" name="Detail3.{normalize-space($dbIDs)}.phy_attrib_1"
id="Detail3.{normalize-space($dbIDs)}.phy_attrib_1" maxlength="10"/> id="Detail3.{normalize-space($dbIDs)}.phy_attrib_1" maxlength="10"/>
...@@ -397,7 +452,7 @@ ...@@ -397,7 +452,7 @@
<th width='300px;'>Sites</th> <th width='300px;'>Sites</th>
<th width='150px;'>PriceList</th> <th width='150px;'>PriceList</th>
<th width='50px;'>Currency</th> <th width='50px;'>Currency</th>
<th width='50px;'>Rate</th> <th width='50px;'>Special Rate</th>
<!-- <th width='50px;'>Cost</th> --> <!-- <th width='50px;'>Cost</th> -->
<th width='50px;'>Date&#160;From</th> <th width='50px;'>Date&#160;From</th>
<th width='50px;'>Date&#160;To</th> <th width='50px;'>Date&#160;To</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment