WebSVN – SmartDukaan – Diff – //trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm



							<th >previouslyOrderedQty</th>
							<th style="display:none;">LastXDaysSale</th>
							<th >AverageSale   </th>
							<th style="display:none;">AverageSales   </th>
							<th style="display:none;">InStockDays</th>
							<th >Pending RTOs</th>
							<th >NumDaysStock</th>
							<th >MinStockReq</th>
							<th >AdditionalQty</th>
							<th style="display:none;">SuggestedQty</th>
                            <th ></th>

							<td id="previouslyOrderedQty"><div name="previouslyOrderedQty" readonly /> </td>
							<td id="lastXdaysSale" style="display:none;"><div name="lastXdaysSale" readonly /> </td>
							<td id="avgSale"><div name="avgSale" readonly /> </td>
							<td id="avgSales" style="display:none;"><div name="avgSales" readonly /> </td>
							<td id="numberOfDaysInStock" style="display:none;"><div name="numberOfDaysInStock" readonly /> </td>
                            <td id="pendingRTOs"></td>
							<td id="numberOfDaysStock"><div name="numberOfDaysStock" readonly /> </td>
							<td id="minStockLevel"><div name="minStockLevel" readonly /> </td>
							<td id="additionalQuantity"><div name="additionalQuantity" readonly /> </td>
							<td id="suggestedQuantity" style="display:none;"><div name="suggestedQuantity" readonly /> </td>
							<td ><a id="remove-lineitem" href="#">remove</a></td>

								<td ><input type="text" name="previouslyOrderedQty" value = "$lineItem.getPreviouslyOrderedQty()" style="width:100px" readonly /></td>
								<td style="display:none;"><input type="hidden" name="lastXdaysSale" value = "$lineItem.getLastXdaysSale()" readonly /></td>
								<td ><div id="avgSale"  style="width:100px" readonly />$lineItem.getLastXdaysSale() ($lineItem.getAvgSales())</td>
								<td style="display:none;"><input type="text" name="avgSales" value = "$lineItem.getAvgSales()" style="width:100px" readonly /></td>
								<td style="display:none;"><input type="text" name="numberOfDaysInStock" value = "$lineItem.getNumberOfDaysInStock()" style="width:100px" readonly /></td>
                                <td ><input type="text" name="rtoOrders" value = "$lineItem.getRtoOrders()" style="width:100px" readonly /></td>
								<td ><input type="text" name="numberOfDaysStock" value = "$lineItem.getNumberOfDaysStock()" style="width:100px" readonly /></td>
								<td ><input type="text" name="minStockLevel" value = "$lineItem.getMinStockLevel()" style="width:100px" readonly /></td>
								#set($stockThroughAvgSales = $lineItem.getAvgSales() * $lineItem.getNumberOfDaysStock())
								#if($stockThroughAvgSales > $lineItem.getMinStockLevel())
									#set($additionalQty = $stockThroughAvgSales)
								#else
									#set($additionalQty = $lineItem.getMinStockLevel())
								#end
								#if($lineItem.getRtoOrders() >1)
									#set($additionalQty =$additionalQty -($lineItem.getRtoOrders()/2))
								#end
								<td ><input type="text" name="additionalQuantity" value = "$additionalQty" style="width:100px" readonly /></td>
								<td  style="display:none;"><input type="hidden" name="suggestedQuantity" value = "$lineItem.getSuggestedQuantity()" readonly /></td>
                                <td ><a id="remove-lineitem" href="#">remove</a></td>
                            </tr>
                        #end

Subversion Repositories SmartDukaan

(root)//trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm – Rev 7672 → 8182

Rev 7672		Rev 8182
Line 66...		Line 66...
66	`<th >previouslyOrderedQty</th>`	66	`<th >previouslyOrderedQty</th>`
67	`<th style="display:none;">LastXDaysSale</th>`	67	`<th style="display:none;">LastXDaysSale</th>`
68	`<th >AverageSale </th>`	68	`<th >AverageSale </th>`
69	`<th style="display:none;">AverageSales </th>`	69	`<th style="display:none;">AverageSales </th>`
70	`<th style="display:none;">InStockDays</th>`	70	`<th style="display:none;">InStockDays</th>`
-		71	`<th >Pending RTOs</th>`
71	`<th >NumDaysStock</th>`	72	`<th >NumDaysStock</th>`
72	`<th >MinStockReq</th>`	73	`<th >MinStockReq</th>`
73	`<th >AdditionalQty</th>`	74	`<th >AdditionalQty</th>`
74	`<th style="display:none;">SuggestedQty</th>`	75	`<th style="display:none;">SuggestedQty</th>`
75	`<th ></th>`	76	`<th ></th>`
Line 90...		Line 91...
90	`<td id="previouslyOrderedQty"><div name="previouslyOrderedQty" readonly /> </td>`	91	`<td id="previouslyOrderedQty"><div name="previouslyOrderedQty" readonly /> </td>`
91	`<td id="lastXdaysSale" style="display:none;"><div name="lastXdaysSale" readonly /> </td>`	92	`<td id="lastXdaysSale" style="display:none;"><div name="lastXdaysSale" readonly /> </td>`
92	`<td id="avgSale"><div name="avgSale" readonly /> </td>`	93	`<td id="avgSale"><div name="avgSale" readonly /> </td>`
93	`<td id="avgSales" style="display:none;"><div name="avgSales" readonly /> </td>`	94	`<td id="avgSales" style="display:none;"><div name="avgSales" readonly /> </td>`
94	`<td id="numberOfDaysInStock" style="display:none;"><div name="numberOfDaysInStock" readonly /> </td>`	95	`<td id="numberOfDaysInStock" style="display:none;"><div name="numberOfDaysInStock" readonly /> </td>`
-		96	`<td id="pendingRTOs"></td>`
95	`<td id="numberOfDaysStock"><div name="numberOfDaysStock" readonly /> </td>`	97	`<td id="numberOfDaysStock"><div name="numberOfDaysStock" readonly /> </td>`
96	`<td id="minStockLevel"><div name="minStockLevel" readonly /> </td>`	98	`<td id="minStockLevel"><div name="minStockLevel" readonly /> </td>`
97	`<td id="additionalQuantity"><div name="additionalQuantity" readonly /> </td>`	99	`<td id="additionalQuantity"><div name="additionalQuantity" readonly /> </td>`
98	`<td id="suggestedQuantity" style="display:none;"><div name="suggestedQuantity" readonly /> </td>`	100	`<td id="suggestedQuantity" style="display:none;"><div name="suggestedQuantity" readonly /> </td>`
99	`<td ><a id="remove-lineitem" href="#">remove</a></td>`	101	`<td ><a id="remove-lineitem" href="#">remove</a></td>`
Line 116...		Line 118...
116	`<td ><input type="text" name="previouslyOrderedQty" value = "$lineItem.getPreviouslyOrderedQty()" style="width:100px" readonly /></td>`	118	`<td ><input type="text" name="previouslyOrderedQty" value = "$lineItem.getPreviouslyOrderedQty()" style="width:100px" readonly /></td>`
117	`<td style="display:none;"><input type="hidden" name="lastXdaysSale" value = "$lineItem.getLastXdaysSale()" readonly /></td>`	119	`<td style="display:none;"><input type="hidden" name="lastXdaysSale" value = "$lineItem.getLastXdaysSale()" readonly /></td>`
118	`<td ><div id="avgSale" style="width:100px" readonly />$lineItem.getLastXdaysSale() ($lineItem.getAvgSales())</td>`	120	`<td ><div id="avgSale" style="width:100px" readonly />$lineItem.getLastXdaysSale() ($lineItem.getAvgSales())</td>`
119	`<td style="display:none;"><input type="text" name="avgSales" value = "$lineItem.getAvgSales()" style="width:100px" readonly /></td>`	121	`<td style="display:none;"><input type="text" name="avgSales" value = "$lineItem.getAvgSales()" style="width:100px" readonly /></td>`
120	`<td style="display:none;"><input type="text" name="numberOfDaysInStock" value = "$lineItem.getNumberOfDaysInStock()" style="width:100px" readonly /></td>`	122	`<td style="display:none;"><input type="text" name="numberOfDaysInStock" value = "$lineItem.getNumberOfDaysInStock()" style="width:100px" readonly /></td>`
-		123	`<td ><input type="text" name="rtoOrders" value = "$lineItem.getRtoOrders()" style="width:100px" readonly /></td>`
121	`<td ><input type="text" name="numberOfDaysStock" value = "$lineItem.getNumberOfDaysStock()" style="width:100px" readonly /></td>`	124	`<td ><input type="text" name="numberOfDaysStock" value = "$lineItem.getNumberOfDaysStock()" style="width:100px" readonly /></td>`
122	`<td ><input type="text" name="minStockLevel" value = "$lineItem.getMinStockLevel()" style="width:100px" readonly /></td>`	125	`<td ><input type="text" name="minStockLevel" value = "$lineItem.getMinStockLevel()" style="width:100px" readonly /></td>`
123	`#set($stockThroughAvgSales = $lineItem.getAvgSales() * $lineItem.getNumberOfDaysStock())`	126	`#set($stockThroughAvgSales = $lineItem.getAvgSales() * $lineItem.getNumberOfDaysStock())`
124	`#if($stockThroughAvgSales > $lineItem.getMinStockLevel())`	127	`#if($stockThroughAvgSales > $lineItem.getMinStockLevel())`
125	`#set($additionalQty = $stockThroughAvgSales)`	128	`#set($additionalQty = $stockThroughAvgSales)`
126	`#else`	129	`#else`
127	`#set($additionalQty = $lineItem.getMinStockLevel())`	130	`#set($additionalQty = $lineItem.getMinStockLevel())`
128	`#end`	131	`#end`
-		132	`#if($lineItem.getRtoOrders() >1)`
-		133	`#set($additionalQty =$additionalQty -($lineItem.getRtoOrders()/2))`
-		134	`#end`
129	`<td ><input type="text" name="additionalQuantity" value = "$additionalQty" style="width:100px" readonly /></td>`	135	`<td ><input type="text" name="additionalQuantity" value = "$additionalQty" style="width:100px" readonly /></td>`
130	`<td style="display:none;"><input type="hidden" name="suggestedQuantity" value = "$lineItem.getSuggestedQuantity()" readonly /></td>`	136	`<td style="display:none;"><input type="hidden" name="suggestedQuantity" value = "$lineItem.getSuggestedQuantity()" readonly /></td>`
131	`<td ><a id="remove-lineitem" href="#">remove</a></td>`	137	`<td ><a id="remove-lineitem" href="#">remove</a></td>`
132	`</tr>`	138	`</tr>`
133	`#end`	139	`#end`