Skip to content

B
business-java
Commit 67c55f55 authored by wansari's avatar wansari
Browse files
Options

updated XSL on HEAD to change label for Tax Chapter and Tax label as Purchase Tax and Sales Tax 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103138 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 00933be3
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWiz1_wiz_en_US_A.xsl
View file @ 67c55f55
...@@ -537,36 +537,36 @@ ...@@ -537,36 +537,36 @@
<!-- Changed by wasim on 27-07-2016 to add tax chapter [START] --> <!-- Changed by wasim on 27-07-2016 to add tax chapter [START] -->
<tr> <tr>
<td class="td_leftAlign" nowrap="true"> <td class="td_leftAlign" nowrap="true">
<strong>Tax Chapter :</strong> <strong>Purchase Tax* :</strong>
</td> </td>
<td class="td_leftAlign"> <td class="td_leftAlign">
<div style="position:relative; width: 88%;"> <div style="position:relative; width: 88%;">
<input type="text" class="editInputClass" value="{$tax_chap}" name="Detail1.{normalize-space($dbID)}.tax_chap" <input type="text" class="editInputClass" value="{$tax_chap}" name="Detail1.{normalize-space($dbID)}.tax_chap"
id="Detail1.{normalize-space($dbID)}.tax_chap" maxlength="10" ISCHANGED="false" readOnly = "1" id="Detail1.{normalize-space($dbID)}.tax_chap" maxlength="10" ISCHANGED="false" readOnly = "1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','tax_chap', 'Tax Chapter', 0);" onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','tax_chap', 'Purchase Tax', 0);"
style="width: 95%;"/> style="width: 95%;"/>
<div style="width:3%; float: right;"> <div style="width:3%; float: right;">
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','tax_chap', 'Tax Chapter', 0);" <a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($site_code)}','tax_chap', 'Purchase Tax', 0);"
style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.tax_chap_pophelp" > style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.tax_chap_pophelp" >
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -4px;" title="Select Tax Chapter" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -4px;" title="Select Purchase Tax" />
</a> </a>
</div> </div>
</div> </div>
</td> </td>
<td class="td_rightAlign" colspan="2"> <td class="td_rightAlign" colspan="2">
<strong>Tax* :</strong><!--Changed by Parikshit Kumbhar on 22/06/2015 [D15CKAT031] [* added] --> <strong>Sales Tax* :</strong><!--Changed by Parikshit Kumbhar on 22/06/2015 [D15CKAT031] [* added] -->
<input type="text" class="editInputClass" value="{$tax_desc}" name="Detail1.{normalize-space($dbID)}.tax_desc" <input type="text" class="editInputClass" value="{$tax_desc}" name="Detail1.{normalize-space($dbID)}.tax_desc"
id="Detail1.{normalize-space($dbID)}.tax_desc" maxlength="20" ISCHANGED="false" readOnly="1" id="Detail1.{normalize-space($dbID)}.tax_desc" maxlength="20" ISCHANGED="false" readOnly="1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','tax', 'Tax Codes', 0);" onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','{normalize-space($login_code)}','tax', 'Sales Tax', 0);"
style="width: 75%;" /> style="width: 75%;" />
<input type="hidden" class="editInputClass" value="{$tax}" name="Detail1.{normalize-space($dbID)}.tax" <input type="hidden" class="editInputClass" value="{$tax}" name="Detail1.{normalize-space($dbID)}.tax"
id="Detail1.{normalize-space($dbID)}.tax" maxlength="20" ISCHANGED="false" readOnly="1" /> id="Detail1.{normalize-space($dbID)}.tax" maxlength="20" ISCHANGED="false" readOnly="1" />
<div style="width:3%; float: right;"> <div style="width:3%; float: right;">
<a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($login_code)}','tax', 'Tax Codes', 0);" <a href="javascript:callListJSP('{normalize-space($dbID)}','{normalize-space($login_code)}','tax', 'Sales Tax', 0);"
style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.tax_desc_pophelp" > style="float: left;text-decoration: none;" id="Detail1.{normalize-space($dbID)}.tax_desc_pophelp" >
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -2px;" title="Select Tax Codes" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -2px;" title="Select Sales Tax" />
</a> </a>
</div> </div>
</td> </td>
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWiz2_wiz_en_US_A.xsl
View file @ 67c55f55
...@@ -320,8 +320,8 @@ ...@@ -320,8 +320,8 @@
<!-- 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>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>Tax&#160;Chapter</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>
...@@ -454,13 +454,13 @@ ...@@ -454,13 +454,13 @@
id="Detail2.{normalize-space($dbIDs)}.tax_desc" maxlength="10"/> id="Detail2.{normalize-space($dbIDs)}.tax_desc" maxlength="10"/>
<div style="float:left;width: 85%;" id="tax.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;" <div style="float:left;width: 85%;" id="tax.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_desc', 'Tax Code', '{normalize-space($dbIDs)}');"> onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_desc', 'Sales Tax', '{normalize-space($dbIDs)}');">
<xsl:value-of select="tax_desc"/> <xsl:value-of select="tax_desc"/>
</div> </div>
<div style="float:right;position:relative; width: 8%;"> <div style="float:right;position:relative; width: 8%;">
<a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_desc', 'Tax Code', '{normalize-space($dbIDs)}');" style="float: left;text-decoration: none;"> <a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_desc', 'Sales Tax', '{normalize-space($dbIDs)}');" style="float: left;text-decoration: none;">
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Tax Code" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Sales Tax" />
</a> </a>
</div> </div>
</td> </td>
...@@ -471,13 +471,13 @@ ...@@ -471,13 +471,13 @@
id="Detail2.{normalize-space($dbIDs)}.tax_chap" maxlength="10"/> id="Detail2.{normalize-space($dbIDs)}.tax_chap" maxlength="10"/>
<div style="float:left;width: 85%;" id="tax_chap.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;" <div style="float:left;width: 85%;" id="tax_chap.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_chapII', 'Tax Chapter', '{normalize-space($dbIDs)}');"> onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_chapII', 'Purchase Tax', '{normalize-space($dbIDs)}');">
<xsl:value-of select="tax_chap"/> <xsl:value-of select="tax_chap"/>
</div> </div>
<div style="float:right;position:relative; width: 8%;"> <div style="float:right;position:relative; width: 8%;">
<a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_chapII', 'Tax Chapter', '{normalize-space($dbIDs)}');" style="float: left;text-decoration: none;"> <a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_chapII', 'Purchase Tax', '{normalize-space($dbIDs)}');" style="float: left;text-decoration: none;">
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Tax Chapter" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Purchase Tax" />
</a> </a>
</div> </div>
</td> </td>
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWizEdit2_wiz_en_US_A.xsl
View file @ 67c55f55
...@@ -389,20 +389,20 @@ function setActionVal( value ) ...@@ -389,20 +389,20 @@ function setActionVal( value )
<!-- 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">
<strong>Tax Chapter :</strong> <strong>Purchase Tax :</strong>
</td> </td>
<td class="td_leftAlign"> <td class="td_leftAlign">
<div style="position:relative; width: 88%;"> <div style="position:relative; width: 88%;">
<input type="text" class="editInputClass" value="{$tax_chap}" name="Detail2.{normalize-space($dbID)}.tax_chap" <input type="text" class="editInputClass" value="{$tax_chap}" name="Detail2.{normalize-space($dbID)}.tax_chap"
id="Detail2.{normalize-space($dbID)}.tax_chap" maxlength="10" ISCHANGED="false" readOnly = "1" id="Detail2.{normalize-space($dbID)}.tax_chap" maxlength="10" ISCHANGED="false" readOnly = "1"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','0','tax_chap', 'Tax Chapter', '0');" onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbID)}','0','tax_chap', 'Purchase Tax', '0');"
style="width: 95%;" onkeypress="return disableEnter()"/> style="width: 95%;" onkeypress="return disableEnter()"/>
<div style="width:3%; float: right;"> <div style="width:3%; float: right;">
<a href="javascript:callListJSP('{normalize-space($dbID)}','0','tax_chap', 'Tax Chapter', '0');" <a href="javascript:callListJSP('{normalize-space($dbID)}','0','tax_chap', 'Purchase Tax', '0');"
style="float: left;text-decoration: none;" id="Detail2.{normalize-space($dbID)}.tax_chap_pophelp" style="float: left;text-decoration: none;" id="Detail2.{normalize-space($dbID)}.tax_chap_pophelp"
onkeypress="return disableEnter()" > onkeypress="return disableEnter()" >
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Tax Chapter" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Purchase Tax" />
</a> </a>
</div> </div>
</div> </div>
......
webitm-wms/module-resource/web/xsl/WIZARD/dd_productWizEdit3_wiz_en_US_A.xsl
View file @ 67c55f55
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<!-- 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>Tax</th> <th>Sales&#160;Tax</th>
<th>Tax&#160;Chapter</th> <th>Purchase&#160;Tax</th>
<th>Length</th> <th>Length</th>
<th>Width</th> <th>Width</th>
<th>Height</th> <th>Height</th>
...@@ -344,14 +344,14 @@ ...@@ -344,14 +344,14 @@
id="Detail3.{normalize-space($dbIDs)}.tax_descr" maxlength="10"/> id="Detail3.{normalize-space($dbIDs)}.tax_descr" maxlength="10"/>
<div style="float:left;width: 85%;" id="tax.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;" <div style="float:left;width: 85%;" id="tax.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_desc', 'Tax Code', '{normalize-space($dbIDs)}');"> onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_desc', 'Sales Tax', '{normalize-space($dbIDs)}');">
<xsl:value-of select="tax_descr"/> <xsl:value-of select="tax_descr"/>
</div> </div>
<div style="float:right;position:relative; width: 8%;"> <div style="float:right;position:relative; width: 8%;">
<a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_desc', 'Tax Code', '{normalize-space($dbIDs)}');" <a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_desc', 'Sales Tax', '{normalize-space($dbIDs)}');"
style="float: left;text-decoration: none;"> style="float: left;text-decoration: none;">
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Tax Code" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Sales Tax" />
</a> </a>
</div> </div>
</td> </td>
...@@ -362,14 +362,14 @@ ...@@ -362,14 +362,14 @@
id="Detail3.{normalize-space($dbIDs)}.tax_chap" maxlength="10"/> id="Detail3.{normalize-space($dbIDs)}.tax_chap" maxlength="10"/>
<div style="float:left;width: 85%;" id="tax_chap.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;" <div style="float:left;width: 85%;" id="tax_chap.{normalize-space($dbIDs)}" contenteditable="true" onkeypress="return false;"
onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_chapII', 'Tax Chapter', '{normalize-space($dbIDs)}');"> onkeydown="javascript:openSearchPopup(event, '{normalize-space($dbIDs)}','0','tax_chapII', 'Purchase Tax', '{normalize-space($dbIDs)}');">
<xsl:value-of select="tax_chap"/> <xsl:value-of select="tax_chap"/>
</div> </div>
<div style="float:right;position:relative; width: 8%;"> <div style="float:right;position:relative; width: 8%;">
<a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_chapII', 'Tax Chapter', '{normalize-space($dbIDs)}');" <a href="javascript:callListJSP('{normalize-space($dbIDs)}','0','tax_chapII', 'Purchase Tax', '{normalize-space($dbIDs)}');"
style="float: left;text-decoration: none;" id="Detail3.{normalize-space($dbIDs)}.tax_chap_pophelp" > style="float: left;text-decoration: none;" id="Detail3.{normalize-space($dbIDs)}.tax_chap_pophelp" >
<img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Tax Chapter" /> <img src="/ibase/webitm/images/DD/popup1.png" style="margin-left: -5px;" title="Select Purchase Tax" />
</a> </a>
</div> </div>
</td> </td>
......
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