Hotfix/122 stock history balance bug (openboxes#154)

* openboxes#122: Fixed bug with the stock history balance column holding onto some quantity that should have been zero'd out * bumped app version to 0.7.10
lnball · Jun 23, 2016 · b3abde6 · b3abde6
1 parent 33e7d11
commit b3abde6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/application.properties b/application.properties
@@ -7,7 +7,7 @@ app.grails.version=1.3.7
 app.name=openboxes
 app.revisionNumber=11160
 app.servlet.version=2.4
-app.version=0.7.9
+app.version=0.7.10
 plugins.barcode4j=0.2.1
 plugins.bubbling=2.1.4
 plugins.clickstream=0.2.0

diff --git a/grails-app/views/inventoryItem/_showStockHistory.gsp b/grails-app/views/inventoryItem/_showStockHistory.gsp
@@ -75,6 +75,13 @@
                         <g:set var="count" value="${0}"/>
                         <g:set var="previousTransaction" value='${null }'/>
                         <g:each var="transaction" in="${transactionMap?.keySet()?.sort {it.transactionDate} }" status="status">
+
+                            <%
+                                if(transaction?.transactionType?.transactionCode== org.pih.warehouse.inventory.TransactionCode.PRODUCT_INVENTORY) {
+                                    balanceByInventoryItem = [:]
+                                }
+                            %>
+
                             <g:each var="transactionEntry" in="${transaction.transactionEntries.findAll { it.inventoryItem.product?.id ==  commandInstance?.productInstance?.id}}" status="status2">
                                 <g:set var="rowClass" value=""/>
                                 <%
@@ -337,7 +344,6 @@
                         <th class="center">
                             <g:formatNumber number="${balanceByInventoryItem?.values()?.sum()?:0}" format="#,###"/>
                         </th>
-
                     </tr>
                 </tfoot>
             </table>