Skip to content

B
business-java
Commit 5222e0b0 authored by smestry's avatar smestry
Browse files
Options

Updated xsl files for product wizard add and edit to add new field trade mark. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103477 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 78292df0
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 5 deletions
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWiz1_wiz_en_US_A.xsl
View file @ 5222e0b0
...@@ -129,6 +129,11 @@ ...@@ -129,6 +129,11 @@
<!--Added by wasim on 14-07-2015 to get login site code [START] --> <!--Added by wasim on 14-07-2015 to get login site code [START] -->
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable> <xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<!--Added by wasim on 14-07-2015 to get login site code [START] --> <!--Added by wasim on 14-07-2015 to get login site code [START] -->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<xsl:variable name="trade_mark"><xsl:value-of select="trade_mark"/></xsl:variable>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<input type="hidden" name="Detail1.{normalize-space($dbID)}.login_code" id="Detail1.{normalize-space($dbID)}.login_code" <input type="hidden" name="Detail1.{normalize-space($dbID)}.login_code" id="Detail1.{normalize-space($dbID)}.login_code"
...@@ -530,6 +535,16 @@ ...@@ -530,6 +535,16 @@
<input type="text" class="editInputClass" value="{$pur_lead_time}" name="Detail1.{normalize-space($dbID)}.pur_lead_time" <input type="text" class="editInputClass" value="{$pur_lead_time}" name="Detail1.{normalize-space($dbID)}.pur_lead_time"
id="Detail1.{normalize-space($dbID)}.pur_lead_time" maxlength="4" style='text-align: right; width: 90%' onchange='return isNumeric1(this)' /> id="Detail1.{normalize-space($dbID)}.pur_lead_time" maxlength="4" style='text-align: right; width: 90%' onchange='return isNumeric1(this)' />
</td> </td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<td class="td_rightAlign" colspan="2">
<strong>Trade Mark:</strong>
<input type="text" name="Detail1.{normalize-space($dbID)}.trade_mark" id="Detail1.{normalize-space($dbID)}.trade_mark"
value="{trade_mark}" class="editInputClass" maxlength="25" style="width: 75%;"
onkeyup = "return specialCharValidate(this.id);" />
</td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
</tr> </tr>
<!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field] END --> <!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field] END -->
<!-- Ends.. --> <!-- Ends.. -->
...@@ -573,6 +588,8 @@ ...@@ -573,6 +588,8 @@
</tr> </tr>
<!-- Changed by wasim on 27-07-2016 to add tax chapter [END] --> <!-- Changed by wasim on 27-07-2016 to add tax chapter [END] -->
<tr> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign" nowrap="true">
<strong>Length* :</strong> <!--Changed by Parikshit Kumbhar on 22/06/2015 [D15CKAT031] [* & maxlength added] --> <strong>Length* :</strong> <!--Changed by Parikshit Kumbhar on 22/06/2015 [D15CKAT031] [* & maxlength added] -->
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWiz2_wiz_en_US_A.xsl
View file @ 5222e0b0
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
{ width: 150, align: 'left' }, { width: 150, align: 'left' },
{ width: 250, align: 'left' }, { width: 250, align: 'left' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' },
{ width: 80, align: 'center' }, { width: 80, align: 'center' },
{ width: 80, align: 'center' }, { width: 80, align: 'center' },
{ width: 80, align: 'center' }, { width: 80, align: 'center' },
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 150, align: 'center' }, { width: 150, align: 'center' },
{ width: 150, align: 'center' }, { width: 150, align: 'center' },
], ],
sort: true sort: true
}); });
...@@ -187,6 +188,10 @@ ...@@ -187,6 +188,10 @@
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable> <xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<!--Changed by wasim on 05-08-2016 for tac chapter [END]--> <!--Changed by wasim on 05-08-2016 for tac chapter [END]-->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<xsl:variable name="trade_mark"><xsl:value-of select="trade_mark"/></xsl:variable>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<xsl:if test="$dbID = '0'"> <xsl:if test="$dbID = '0'">
<input type="hidden" name="Detail2.{normalize-space($dbID)}.login_code" id ="login_code" value="{$login_code}" ISCHANGED="false"/> <input type="hidden" name="Detail2.{normalize-space($dbID)}.login_code" id ="login_code" value="{$login_code}" ISCHANGED="false"/>
...@@ -295,6 +300,11 @@ ...@@ -295,6 +300,11 @@
<!--Changed by wasim on 15-03-2016 to set tax_chap for prevoius button [START]--> <!--Changed by wasim on 15-03-2016 to set tax_chap for prevoius button [START]-->
<input type="hidden" value="{$tax_chap}" name="Detail2.{normalize-space($dbID)}.tax_chap" id="tax_chap" /> <input type="hidden" value="{$tax_chap}" name="Detail2.{normalize-space($dbID)}.tax_chap" id="tax_chap" />
<!--Changed by wasim on 15-03-2016 to set tax_chap for prevoius button [END]--> <!--Changed by wasim on 15-03-2016 to set tax_chap for prevoius button [END]-->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<input type="hidden" value="{$trade_mark}" name="Detail2.{normalize-space($dbID)}.trade_mark" id="trade_mark" />
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:for-each>
</div> </div>
...@@ -320,8 +330,10 @@ ...@@ -320,8 +330,10 @@
<!-- Changed by Sneha on 23-06-2016, for display of Dimension instead of Fitting [End] --> <!-- Changed by Sneha on 23-06-2016, for display of Dimension instead of Fitting [End] -->
<th>Category</th> <th>Category</th>
<th>Trade&#160;Mark</th> <!-- Added by Sneha on 26-09-2016 -->
<th>Sales&#160;Tax</th> <!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field in SKU] --> <th>Sales&#160;Tax</th> <!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field in SKU] -->
<th>Purchase&#160;Tax</th> <!-- Added by wasim on 27-07-2016 --> <th>Purchase&#160;Tax</th> <!-- Added by wasim on 27-07-2016 -->
<th>Length</th> <th>Length</th>
<th>Width</th> <th>Width</th>
<th>Height</th> <th>Height</th>
...@@ -380,6 +392,10 @@ ...@@ -380,6 +392,10 @@
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable> <xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<!--Changed by wasim on 27-07-2016 for tax chapter [END] --> <!--Changed by wasim on 27-07-2016 for tax chapter [END] -->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<xsl:variable name="trade_mark"><xsl:value-of select="trade_mark"/></xsl:variable>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<xsl:if test="$dbIDs > '0'"> <xsl:if test="$dbIDs > '0'">
<tr> <tr>
<td > <td >
...@@ -407,9 +423,6 @@ ...@@ -407,9 +423,6 @@
<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')">
...@@ -445,6 +458,15 @@ ...@@ -445,6 +458,15 @@
</a> </a>
</div> </div>
</td> </td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<td>
<input type="text" class="editInputClass" size="15" value="{$trade_mark}" name="Detail2.{normalize-space($dbIDs)}.trade_mark"
id="Detail2.{normalize-space($dbIDs)}.trade_mark" maxlength="25" style='text-align: right;'
onkeypress="return disableEnter()"/>
</td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field in SKU] Start --> <!--Added by Parikshit Kumbhar on 26/05/2015 [Added Tax field in SKU] Start -->
<td > <td >
<input type="hidden" value="{$tax}" name="Detail2.{normalize-space($dbIDs)}.tax" <input type="hidden" value="{$tax}" name="Detail2.{normalize-space($dbIDs)}.tax"
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWizEdit2_wiz_en_US_A.xsl
View file @ 5222e0b0
...@@ -121,6 +121,10 @@ function setActionVal( value ) ...@@ -121,6 +121,10 @@ function setActionVal( value )
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable> <xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<!--Changed by wasim on 02-08-2016 for tax chapter [END]--> <!--Changed by wasim on 02-08-2016 for tax chapter [END]-->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<xsl:variable name="trade_mark"><xsl:value-of select="trade_mark"/></xsl:variable>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<input type="hidden" name="Detail2.{normalize-space($dbID)}.login_code" id="Detail2.{normalize-space($dbID)}.login_code" <input type="hidden" name="Detail2.{normalize-space($dbID)}.login_code" id="Detail2.{normalize-space($dbID)}.login_code"
...@@ -386,6 +390,8 @@ function setActionVal( value ) ...@@ -386,6 +390,8 @@ function setActionVal( value )
id="Detail2.{normalize-space($dbID)}.tax" maxlength="10" ISCHANGED="false" readOnly = "1"/> id="Detail2.{normalize-space($dbID)}.tax" maxlength="10" ISCHANGED="false" readOnly = "1"/>
</td> </td>
</tr> </tr>
<!-- Changed by wasim on 03-08-2016 for tax chapter [START] --> <!-- Changed by wasim on 03-08-2016 for tax chapter [START] -->
<tr> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign" nowrap="true">
...@@ -410,6 +416,19 @@ function setActionVal( value ) ...@@ -410,6 +416,19 @@ function setActionVal( value )
</tr> </tr>
<!-- Changed by wasim on 03-08-2016 for tax chapter [END] --> <!-- Changed by wasim on 03-08-2016 for tax chapter [END] -->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<tr>
<td class="td_leftAlign" nowrap="true" style="width:20%;">
<strong>Trade Mark:</strong>
</td>
<td class="td_leftAlign" nowrap="true">
<input type="text" name="Detail2.{normalize-space($dbID)}.trade_mark" id="Detail2.{normalize-space($dbID)}.trade_mark"
value="{trade_mark}" class="editInputClass" maxlength="25" style="width:100%;"
onkeyup = "return specialCharValidate(this.id);" />
</td>
</tr>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<tr style="height: 10px;"> <tr style="height: 10px;">
</tr> </tr>
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWizEdit3_wiz_en_US_A.xsl
View file @ 5222e0b0
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
{ width: 150, align: 'left' }, { width: 150, align: 'left' },
{ width: 250, align: 'left' }, { width: 250, align: 'left' },
{ width: 120, align: 'center' }, { width: 120, align: 'center' },
{ width: 120, align: 'center' },/* Changed by sneha on 27-09-2016 for trade mark*/
{ width: 120, align: 'center' },/* Changed by wasim on 02-08-2016 for tax chapter*/ { width: 120, align: 'center' },/* Changed by wasim on 02-08-2016 for tax chapter*/
{ width: 80, align: 'center' }, { width: 80, align: 'center' },
{ width: 80, align: 'center' }, { width: 80, align: 'center' },
...@@ -137,6 +138,7 @@ ...@@ -137,6 +138,7 @@
<!-- Changed by Sneha on 23-06-2016, for display of Dimension instead of Fitting [End] --> <!-- Changed by Sneha on 23-06-2016, for display of Dimension instead of Fitting [End] -->
<th>Category</th> <th>Category</th>
<th>Trade&#160;Mark</th> <!-- Added by Sneha on 26-09-2016 -->
<th>Sales&#160;Tax</th> <th>Sales&#160;Tax</th>
<th>Purchase&#160;Tax</th> <th>Purchase&#160;Tax</th>
<th>Length</th> <th>Length</th>
...@@ -203,6 +205,10 @@ ...@@ -203,6 +205,10 @@
<!--Changed by wasim on 02-08-2016 for tax chapter [START]--> <!--Changed by wasim on 02-08-2016 for tax chapter [START]-->
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable> <xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<!--Changed by wasim on 02-08-2016 for tax chapter [END]--> <!--Changed by wasim on 02-08-2016 for tax chapter [END]-->
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<xsl:variable name="trade_mark"><xsl:value-of select="trade_mark"/></xsl:variable>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<xsl:if test="$dbIDs > '0'"> <xsl:if test="$dbIDs > '0'">
...@@ -336,6 +342,14 @@ ...@@ -336,6 +342,14 @@
</div> </div>
</td> </td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [Start] -->
<td>
<input type="text" class="editInputClass" size="15" value="{$trade_mark}" name="Detail3.{normalize-space($dbIDs)}.trade_mark"
id="Detail3.{normalize-space($dbIDs)}.trade_mark" maxlength="25" style='text-align: right;'
onkeypress="return disableEnter()"/>
</td>
<!-- Changed by Sneha on 26-09-2016, to add new field trade mark [End] -->
<td> <td>
<input type="hidden" value="{$tax}" name="Detail3.{normalize-space($dbIDs)}.tax" <input type="hidden" value="{$tax}" name="Detail3.{normalize-space($dbIDs)}.tax"
id="Detail3.{normalize-space($dbIDs)}.tax" maxlength="10"/> id="Detail3.{normalize-space($dbIDs)}.tax" maxlength="10"/>
......
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