Skip to content

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

Updated the xsl file to display the discount field in SO and PO Wizard. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104455 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d050a129
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 5 deletions
webitm-wms/module-resource/web/xsl/WIZARD/porderWiz3_wiz_en_US_A.xsl
View file @ a717ce0d
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
</xsl:for-each> </xsl:for-each>
<div style="height:75%; width:100%;overflow:auto;white-space:nowrap;"> <div style="height:75%; width:100%;overflow:auto;white-space:nowrap;">
<table id="Details" class="headertableClass" border="0" cellspacing="0" cellpadding="0" width='100%'> <table id="Details" class="headertableClass" border="0" cellspacing="0" cellpadding="0" width='100%' style = "color: #333 !important;">
<thead class="table-head"> <thead class="table-head">
<tr> <tr>
<th class="tHeader" nowrap="true" style="width:20px;display:none"> <th class="tHeader" nowrap="true" style="width:20px;display:none">
...@@ -222,6 +222,13 @@ ...@@ -222,6 +222,13 @@
<th class="tHeader" align="right" nowrap="true" valign="bottom"> <th class="tHeader" align="right" nowrap="true" valign="bottom">
Unit Cost Unit Cost
</th> </th>
<!-- Added by Sneha on 20-01-2017, to add discount field [Start] -->
<th class="tHeader" align="right" nowrap="true" valign="bottom">
Discount(%)
</th>
<!-- Added by Sneha on 20-01-2017, to add discount field [Start] -->
<!--Changed by wasim on 07-07-2015 to add currency in form3 [START]--> <!--Changed by wasim on 07-07-2015 to add currency in form3 [START]-->
<th class="tHeader" align="left" nowrap="true" valign="bottom"> <th class="tHeader" align="left" nowrap="true" valign="bottom">
Currency Currency
...@@ -330,9 +337,15 @@ ...@@ -330,9 +337,15 @@
<td align="right" style="width:75px"> <td align="right" style="width:75px">
<!--<xsl:value-of select="rate"/>--> <!--<xsl:value-of select="rate"/>-->
<input type="text" class="editInputClass" value="{$rate}" name="Detail3.{normalize-space($dbID)}.rate" <input type="text" class="editInputClass" value="{$rate}" name="Detail3.{normalize-space($dbID)}.rate"
onkeypress='return isNumberKey(event)' onkeyup='changeAmount({$dbID});Limit(this.id)' onkeypress='return isNumberKey(event)' onkeyup='changeAmount({$dbID});Limit(this.id)'
onfocusout='changeAmount({$dbID});Round(this.id)' id="Detail3.{normalize-space($dbID)}.rate" style="text-align: right;width:44px;"/> onfocusout='changeAmount({$dbID});Round(this.id)' id="Detail3.{normalize-space($dbID)}.rate" style="text-align: right;width:44px;"/>
</td> </td>
<td align="right" style="width:75px">
<input type="text" class="editInputClass" value="{$discount}" name="Detail3.{normalize-space($dbID)}.discount"
id="Detail3.{normalize-space($dbID)}.discount" onkeypress='return isNumberKey(event)' style="text-align: right;width:44px;"/>
</td>
<!--Changed by wasim on 07-07-2015 to add currency in form3 [START]--> <!--Changed by wasim on 07-07-2015 to add currency in form3 [START]-->
<td style="width:75px"> <td style="width:75px">
<xsl:value-of select="curr_code"/> <xsl:value-of select="curr_code"/>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz3_wiz_en_US_A.xsl
View file @ a717ce0d
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
$('#Details').fxdHdrCol({ $('#Details').fxdHdrCol({
fixedCols: 0, fixedCols: 0,
width: "100%", width: "200%",
height: "85%", height: "85%",
colModal: [ colModal: [
{ width: 5, align: 'center' }, { width: 5, align: 'center' },
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
{ width: 70, align: 'center' }, { width: 70, align: 'center' },
{ width: 70, align: 'center' }, { width: 70, align: 'center' },
{ width: 70, align: 'center' }, { width: 70, align: 'center' },
{ width: 50, align: 'center' },
{ width: 200, align: 'center' }, { width: 200, align: 'center' },
{ width: 70, align: 'center' }, { width: 70, align: 'center' },
{ width: 70, align: 'center' }, { width: 70, align: 'center' },
...@@ -260,7 +261,7 @@ ...@@ -260,7 +261,7 @@
</xsl:for-each> </xsl:for-each>
<div style="height:75%; width:100%;margin-top:2px;margin-left:2px;overflow:-moz-scrollbars-vertical;overflow-x:auto;overflow-y:auto;white-space:nowrap;border:thin ridge lightgray;"> <div style="height:75%; width:100%;margin-top:2px;margin-left:2px;overflow:-moz-scrollbars-vertical;overflow-x:auto;overflow-y:auto;white-space:nowrap;border:thin ridge lightgray;">
<table id="Details" class="headertableClass" border="0" cellspacing="0" cellpadding="0" width='100%'> <table id="Details" class="headertableClass" border="0" cellspacing="0" cellpadding="0" width='100%' style = "color: #333 !important;">
<thead class="table-head"> <thead class="table-head">
<tr> <tr>
<th class="tHeader" nowrap="true" style="width:20px;display:none"> <th class="tHeader" nowrap="true" style="width:20px;display:none">
...@@ -284,6 +285,13 @@ ...@@ -284,6 +285,13 @@
<th class="tHeader" nowrap="true" valign="bottom"> <th class="tHeader" nowrap="true" valign="bottom">
Rate Rate
</th> </th>
<!-- Added by Sneha on 20-01-2017, to add discount field [Start] -->
<th class="tHeader" nowrap="true" valign="bottom">
Discount(%)
</th>
<!-- Added by Sneha on 20-01-2017, to add discount field [End] -->
<!-- <th class="thClass" nowrap="true" > <!-- <th class="thClass" nowrap="true" >
<strong>Currency</strong> <strong>Currency</strong>
</th> --> </th> -->
...@@ -325,6 +333,7 @@ ...@@ -325,6 +333,7 @@
<xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable> <xsl:variable name="quantity"><xsl:value-of select="quantity"/></xsl:variable>
<xsl:variable name="unit"><xsl:value-of select="unit"/></xsl:variable> <xsl:variable name="unit"><xsl:value-of select="unit"/></xsl:variable>
<xsl:variable name="rate"><xsl:value-of select="rate"/></xsl:variable> <xsl:variable name="rate"><xsl:value-of select="rate"/></xsl:variable>
<xsl:variable name="discount"><xsl:value-of select="discount"/></xsl:variable> <!-- Added by Sneha on 20-01-2017, to add discount field -->
<xsl:variable name="rate__std"><xsl:value-of select="rate__std"/></xsl:variable> <xsl:variable name="rate__std"><xsl:value-of select="rate__std"/></xsl:variable>
<xsl:variable name="net_amt"><xsl:value-of select="net_amt"/></xsl:variable> <xsl:variable name="net_amt"><xsl:value-of select="net_amt"/></xsl:variable>
<xsl:variable name="tax_class"><xsl:value-of select="tax_class"/></xsl:variable> <xsl:variable name="tax_class"><xsl:value-of select="tax_class"/></xsl:variable>
...@@ -383,13 +392,19 @@ ...@@ -383,13 +392,19 @@
<input type="hidden" value="{$item_descr}" name="Detail3.{normalize-space($dbIDs)}.item_descr" id="Detail3.{normalize-space($dbIDs)}.item_descr" /> <input type="hidden" value="{$item_descr}" name="Detail3.{normalize-space($dbIDs)}.item_descr" id="Detail3.{normalize-space($dbIDs)}.item_descr" />
<!-- Added by Sneha 20-01-2017, to add discount field [Start] -->
<td class="td_rightAlign" style="width:75px;"> <td class="td_rightAlign" style="width:75px;">
<!-- <xsl:value-of select="rate"/> --> <!-- <xsl:value-of select="rate"/> -->
<input type="text" class="editInputClass" value="{$rate}" name="Detail3.{normalize-space($dbIDs)}.rate" id="Detail3.{normalize-space($dbIDs)}.rate" <input type="text" class="editInputClass" value="{$rate}" name="Detail3.{normalize-space($dbIDs)}.rate" id="Detail3.{normalize-space($dbIDs)}.rate"
style="text-align: right;width:60px;" maxlength="4" style="text-align: right;width:60px;" maxlength="4"
onkeyup='changeAmount({$dbIDs});' onkeypress='return isNumeric(event)' /> onkeyup='changeAmount({$dbIDs});' onkeypress='return isNumeric(event)' />
</td> </td>
<!-- Added by Sneha 20-01-2017, to add discount field [End] -->
<td class="td_rightAlign" style="width:75px;">
<input type="text" class="editInputClass" value="{$discount}" name="Detail3.{normalize-space($dbIDs)}.discount" id="Detail3.{normalize-space($dbIDs)}.discount"
style="text-align: right;width:60px;" maxlength="6" onkeypress='return isNumeric(event)'/>
</td>
<!-- <td style="width:75px"> <!-- <td style="width:75px">
<xsl:value-of select="item_parnt"/> <xsl:value-of select="item_parnt"/>
</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