Skip to content

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

W16LKAT002 updated source for discount column issue and setting default values using JSON in header 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104957 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6e69a5e9
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 28 deletions
webitm-wms/module-resource/web/xsl/WIZARD/porderWiz1_wiz_en_US_A.xsl
View file @ b9d40885
...@@ -110,7 +110,7 @@ border:none; ...@@ -110,7 +110,7 @@ border:none;
<!-- Changed by Sneha on 27-05-2016, for purchase order text box [Start] --> <!-- Changed by Sneha on 27-05-2016, for purchase order text box [Start] -->
<tr> <tr>
<td class="td_rightAlign" nowrap="true"> <td class="td_rightAlign" id = "purc_order_label" nowrap="true">
Purchase Order : Purchase Order :
</td> </td>
......
webitm-wms/module-resource/web/xsl/WIZARD/porderWiz3_wiz_en_US_A.xsl
View file @ b9d40885
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</xsl:for-each> </xsl:for-each>
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;"> <div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;">
<table id="errorActivityTable" width="100%" height="10%" class="tableClass" style="margin: 0px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0"> <table id="errorActivityTable" width="100%" height="14%" class="tableClass" style="margin: 0px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0">
<xsl:for-each select="//error"> <xsl:for-each select="//error">
<xsl:if test="position() = 1"> <xsl:if test="position() = 1">
<tr> <tr>
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
</td> </td>
<td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true"> <td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true">
<xsl:value-of select="description"/> <xsl:value-of select="description"/>
<br></br>
<xsl:value-of select="trace"/>
</td> </td>
<td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true"> <td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true">
</td> </td>
...@@ -331,19 +333,28 @@ ...@@ -331,19 +333,28 @@
<xsl:value-of select="descr"/> <xsl:value-of select="descr"/>
</td> </td>
<td align="right" style="width:75px"> <td align="right" style="width:75px">
<input type="text" class="editInputClass" value="{$quantity}" name="Detail3.{normalize-space($dbID)}.quantity" <!-- <input type="text" class="editInputClass" value="{$quantity}" name="Detail3.{normalize-space($dbID)}.quantity"
onkeypress='return isQuantity(event)' id="Detail3.{normalize-space($dbID)}.quantity" maxlength="4" style="text-align: right;width:33px;" onkeyup="changeAmount({$dbID})"/> onkeypress='return isQuantity(event)' id="Detail3.{normalize-space($dbID)}.quantity" maxlength="4" style="text-align: right;width:33px;" onkeyup="changeAmount({$dbID})"/> -->
<input type="text" id="Detail3.{normalize-space($dbID)}.quantity" name="Detail3.{normalize-space($dbID)}.quantity"
value="{$quantity}" class="editInputClass" maxlength="10"
style="width:100%;border:none;text-align: right; outline:none"
onkeypress='return isQuantity(event)'
onchange='changeAmount({$dbID});sendInfo("Detail3.{normalize-space($dbID)}.quantity");'/>
</td> </td>
<td align="right" style="width:75px"> <td align="right" style="width:75px">
<!--<xsl:value-of select="rate"/>--> <input type="text" id="Detail3.{normalize-space($dbID)}.rate" name="Detail3.{normalize-space($dbID)}.rate"
<input type="text" class="editInputClass" value="{$rate}" name="Detail3.{normalize-space($dbID)}.rate" value="{$rate}" class="editInputClass"
onkeypress='return isNumberKey(event)' onkeyup='changeAmount({$dbID});Limit(this.id)' style="width:100%;border:none;text-align: right; outline:none"
onfocusout='changeAmount({$dbID});Round(this.id)' id="Detail3.{normalize-space($dbID)}.rate" style="text-align: right;width:44px;"/> onkeypress='return isNumberKey(event)'
onkeyup='changeAmount({$dbID});Limit(this.id)'
onfocusout='changeAmount({$dbID});Round(this.id)' />
</td> </td>
<td align="right" style="width:75px"> <td align="right" style="width:75px">
<input type="text" class="editInputClass" value="{$discount}" name="Detail3.{normalize-space($dbID)}.discount" <input type="text" class="editInputClass" id="Detail3.{normalize-space($dbID)}.discount" name="Detail3.{normalize-space($dbID)}.discount"
id="Detail3.{normalize-space($dbID)}.discount" onkeypress='return isNumberKey(event)' style="text-align: right;width:44px;"/> value="{$discount}" style="width:100%;border:none;text-align: right; outline:none"
onkeypress='return isNumberKey(event)'
onchange='sendInfo("Detail3.{normalize-space($dbID)}.quantity");' />
</td> </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]-->
......
webitm-wms/module-resource/web/xsl/WIZARD/porderWiz_ItemDetails_wiz_en_US.xsl
View file @ b9d40885
...@@ -27,6 +27,7 @@ $(function() { ...@@ -27,6 +27,7 @@ $(function() {
for( dbID = 1; dbID <= maxId; dbID++) for( dbID = 1; dbID <= maxId; dbID++)
{ {
document.getElementById("DetailITCode."+ dbID +".selectbox").disabled = false;
objCurr = document.getElementById("DetailITCode."+ dbID +".selectbox"); objCurr = document.getElementById("DetailITCode."+ dbID +".selectbox");
if( objCurr.value == 'true' ) if( objCurr.value == 'true' )
...@@ -84,10 +85,10 @@ $(function() { ...@@ -84,10 +85,10 @@ $(function() {
<td> <td>
<xsl:choose> <xsl:choose>
<xsl:when test="$chkbox ='Y'"> <xsl:when test="$chkbox ='Y'">
<input type="checkbox" name="selectbox" id="DetailITCode.{normalize-space($dbID)}.selectbox" checked='true' value="true" onClick="setCheckedPopup(this)"/> <input type="checkbox" name="selectbox" id="DetailITCode.{normalize-space($dbID)}.selectbox" checked='true' disabled = "true" value="true" onClick="setCheckedPopup(this)"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<input type="checkbox" name="selectbox" id="DetailITCode.{normalize-space($dbID)}.selectbox" value="false" onClick="setCheckedPopup(this)"/> <input type="checkbox" name="selectbox" id="DetailITCode.{normalize-space($dbID)}.selectbox" value="false" disabled = "true" onClick="setCheckedPopup(this)"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</td> </td>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz1_wiz_en_US_A.xsl
View file @ b9d40885
...@@ -154,7 +154,7 @@ border:none; ...@@ -154,7 +154,7 @@ border:none;
<xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable> <xsl:variable name="dbID"><xsl:value-of select="@domID"/></xsl:variable>
<tr> <tr>
<td class="td_rightAlign" nowrap="true"> <td class="td_rightAlign" nowrap="true" id = "sale_order_label">
<strong>Sales Order :</strong> <strong>Sales Order :</strong>
</td> </td>
...@@ -616,9 +616,55 @@ border:none; ...@@ -616,9 +616,55 @@ border:none;
</td> </td>
<td class="td_leftAlign"> <td class="td_leftAlign">
<div style="position:relative; width: 90%;"> <div style="position:relative; width: 90%;">
<select name="Detail1.{normalize-space($dbID)}.part_qty" class="input_editable" id="Detail1.{normalize-space($dbID)}.part_qty" value="{$part_qty}"> <select name="Detail1.{normalize-space($dbID)}.part_qty" class="input_editable" id="Detail1.{normalize-space($dbID)}.part_qty">
<!-- <select class="input_editable" onchange = "setPartQty()" id = "partQty"> -->
<option value="0">
<xsl:choose>
<xsl:when test="part_qty = '0'">
<option value='0' selected = "selected">Ship Available</option>
<option value='1'>Ship Complete Order</option>
<option value='2'>Ship Part Order</option>
</xsl:when>
<xsl:when test="part_qty = '1'">
<option value='0'>Ship Available</option>
<option value='1' selected = "selected">Ship Complete Order</option>
<option value='2'>Ship Part Order</option>
</xsl:when>
<xsl:when test="part_qty = '2'">
<option value='0'>Ship Available</option>
<option value='1'>Ship Complete Order</option>
<option value='2' selected = "selected">Ship Part Order</option>
</xsl:when>
<xsl:otherwise>
<option value='0' selected = "selected">Ship Available</option>
<option value='1'>Ship Complete Order</option>
<option value='2'>Ship Part Order</option>
</xsl:otherwise>
</xsl:choose>
<!-- <xsl:choose>
<xsl:when test="$part_qty ='0'">
<option value='0' selected = "selected">Ship Available</option>
<option value='1'>Ship Complete Order</option>
<option value='2'>Ship Part Order</option>
</xsl:when>
</xsl:choose>
<xsl:choose>
<xsl:when test="$part_qty ='1'">
<option value='0'>Ship Available</option>
<option value='1' selected = "selected" >Ship Complete Order</option>
<option value='2'>Ship Part Order</option>
</xsl:when>
</xsl:choose>
<xsl:choose>
<xsl:when test="$part_qty ='2'">
<option value='0'>Ship Available</option>
<option value='1'>Ship Complete Order</option>
<option value='2' selected = "selected">Ship Part Order</option>
</xsl:when>
</xsl:choose> -->
<!-- <option value="0">
<xsl:if test="$part_qty = '0'"> <xsl:if test="$part_qty = '0'">
<xsl:attribute name="selected">true</xsl:attribute> <xsl:attribute name="selected">true</xsl:attribute>
</xsl:if> </xsl:if>
...@@ -637,8 +683,7 @@ border:none; ...@@ -637,8 +683,7 @@ border:none;
<xsl:attribute name="selected">true</xsl:attribute> <xsl:attribute name="selected">true</xsl:attribute>
</xsl:if> </xsl:if>
Ship Part Order Ship Part Order
</option> </option> -->
</select> </select>
</div> </div>
</td> </td>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz3_wiz_en_US_A.xsl
View file @ b9d40885
...@@ -131,13 +131,12 @@ ...@@ -131,13 +131,12 @@
</td> </td>
<td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true"> <td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true">
<xsl:value-of select="description"/> <xsl:value-of select="description"/>
<br></br>
<xsl:value-of select="trace"/>
</td> </td>
<td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true"> <td class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);" nowrap="true">
</td> </td>
</tr> </tr>
<tr class="tdss_leftAlign" style="background: rgba(255, 204, 0, 0.66);">
<xsl:value-of select="trace"/>
</tr>
</xsl:for-each> </xsl:for-each>
<xsl:for-each select="//error"> <xsl:for-each select="//error">
<xsl:variable name="type"><xsl:value-of select="type"/></xsl:variable> <xsl:variable name="type"><xsl:value-of select="type"/></xsl:variable>
...@@ -377,10 +376,10 @@ ...@@ -377,10 +376,10 @@
</td> </td>
<td class="td_rightAlign" style="width:75px;"> <td class="td_rightAlign" style="width:75px;">
<!-- <xsl:value-of select="quantity"/> -->
<input type="text" class="editInputClass" value="{$quantity}" name="Detail3.{normalize-space($dbIDs)}.quantity" id="Detail3.{normalize-space($dbIDs)}.quantity" <input type="text" class="editInputClass" value="{$quantity}" name="Detail3.{normalize-space($dbIDs)}.quantity" id="Detail3.{normalize-space($dbIDs)}.quantity"
style="text-align: right;width:60px;" maxlength="10" style="width:100%;border:none;text-align: right; outline:none" maxlength="10"
onkeyup='changeAmount({$dbIDs});' onkeypress='return isQuantity(event)' /> onchange='changeAmount({$dbIDs});sendInfo("Detail3.{normalize-space($dbIDs)}.quantity");'
onkeypress='return isQuantity(event)' />
</td> </td>
<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" />
...@@ -389,14 +388,17 @@ ...@@ -389,14 +388,17 @@
<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="10" style="width:100%;border:none;text-align: right; outline:none" maxlength="10"
onkeyup='changeAmount({$dbIDs});' onkeypress='return isNumeric(event)' /> onchange='changeAmount({$dbIDs});'
onkeypress='return isQuantity(event)' />
</td> </td>
<!-- Added by Sneha 20-01-2017, to add discount field [End] --> <!-- Added by Sneha 20-01-2017, to add discount field [End] -->
<td class="td_rightAlign" style="width:75px;"> <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" <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)'/> style="width:100%;border:none;text-align: right; outline:none" maxlength="10"
onchange='sendInfo("Detail3.{normalize-space($dbIDs)}.quantity");'
onkeypress='return isQuantity(event);' />
</td> </td>
<!-- <td style="width:75px"> <!-- <td style="width:75px">
<xsl:value-of select="item_parnt"/> <xsl:value-of select="item_parnt"/>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWizCust_List_wiz_en_US.xsl
View file @ b9d40885
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
]]> ]]>
</script> </script>
<body onload="setUserTheme()"> <body>
<form name="Wizard_Team"> <form name="Wizard_Team">
......
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