Skip to content

B
business-java
Commit d5821be1 authored by kdabholkar's avatar kdabholkar
Browse files
Options

commited new changes of tax calculation of sorder wizard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@176372 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 462a8bdf
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 6 deletions
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz2_wiz_en_US_A.xsl
View file @ d5821be1
......@@ -198,6 +198,12 @@
<xsl:variable name="tax_chap"><xsl:value-of select="tax_chap"/></xsl:variable>
<xsl:variable name="tax_class"><xsl:value-of select="tax_class"/></xsl:variable>
<!-- Added by kaustubh on 4 dec 2017 start -->
<xsl:variable name="tax_amt"><xsl:value-of select="tax_amt"/></xsl:variable>
<xsl:variable name="tax_env"><xsl:value-of select="tax_env"/></xsl:variable>
<xsl:variable name="tax_amount"><xsl:value-of select="tax_amount"/></xsl:variable>
<!-- Added by kaustubh on 4 dec 2017 end -->
<xsl:if test="$dbIDs = '0'">
<input type="hidden" value="{$sale_order}" name="Detail2.{normalize-space($dbIDs)}.sale_order" id="sale_order" />
<input type="hidden" value="{$order_date}" name="Detail2.{normalize-space($dbIDs)}.order_date" id="order_date" />
......@@ -241,9 +247,15 @@
<input type="hidden" value="{$price_list}" name="Detail2.{normalize-space($dbIDs)}.price_list" id="price_list" />
<input type="hidden" value="{$price_list__clg}" name="Detail2.{normalize-space($dbIDs)}.price_list__clg" id="price_list__clg" />
<input type="hidden" value="{$tax_chap}" name="Detail2.{normalize-space($dbIDs)}.tax_chap" id="price_list" />
<input type="hidden" value="{$tax_class}" name="Detail2.{normalize-space($dbIDs)}.tax_class" id="price_list" />
<input type="hidden" value="{$tax_chap}" name="Detail2.{normalize-space($dbIDs)}.tax_chap" id="tax_chap" />
<input type="hidden" value="{$tax_class}" name="Detail2.{normalize-space($dbIDs)}.tax_class" id="tax_class" />
<!-- Added by kaustubh on 4 dec 2017 start -->
<input type="hidden" value="{$tax_amt}" name="Detail2.{normalize-space($dbIDs)}.tax_amt" id="tax_amt" />
<input type="hidden" value="{$tax_env}" name="Detail2.{normalize-space($dbIDs)}.tax_env" id="tax_env" />
<input type="hidden" value="{$tax_amount}" name="Detail2.{normalize-space($dbIDs)}.tax_amount" id="tax_amount" />
<!-- Added by kaustubh on 4 dec 2017 end -->
</xsl:if>
</xsl:for-each>
</table>
......@@ -386,7 +398,7 @@
<span></span>
<div id="itemParentImage" style="visibility: hidden">
<div id = "DBImage1" style="overflow: auto; height: 100%">
<div id = "DBImage1" style="overflow: auto; height: 100%;">
</div>
</div>
......@@ -443,8 +455,8 @@
<input type="submit" style="cursor:hand" class="button" value="Previous" title='Previous' id="previous" onclick="javascript:createXMLString()"/>
<input type="submit" style="cursor:hand" class="button" value="Next" title='Next' id="next" onclick="javascript:return setCheckedTrue();"/>
<input type="submit" style="cursor:hand" class="savebutton" value="Previous" title='Previous' id="previous" onclick="javascript:createXMLString()"/>
<input type="submit" style="cursor:hand" class="savebutton" value="Next" title='Next' id="next" onclick="javascript:return setCheckedTrue();"/>
<input type="button" style="cursor:hand" value="Reset" class="tabButton" title='Reset' id="reset" onclick ="javascript:createXMLString1('sorderWiz');"/>
<span title="Add New" class="addNewDetailBtn" id="AddButton" name="AddButton" onclick="createAccordian()" >
......@@ -457,8 +469,12 @@
</div>
</tr>
</table>
<div id="BgGlass" class="bgGlass" style="display: none"></div>
<div id='taxCalDiv' class="popUpContainerForTax"></div>
</div>
<!-- <div class = "buttonDiv" style="width=20%;margin-left=-12px;margin-top:5px;margin-bottom:0px;">
<input type="submit" style="cursor:hand" class="button" value="Previous" title='Previous' id="previous" onclick="javascript:createXMLString()"/>
<input type="submit" style="cursor:hand" class="button" value="Next" title='Next' id="next" onclick="javascript:return setCheckedTrue();"/>
......
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