Merge branch 'bugfix/90-error-occurs-on-receive-shipment' into develop

lnball · Apr 30, 2016 · a109567 · a109567
2 parents c7ee193 + 08563dc
commit a109567
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/grails-app/views/order/_filters.gsp b/grails-app/views/order/_filters.gsp
@@ -2,6 +2,7 @@
  <g:form id="listForm" action="list" method="GET">
  <g:hiddenField name="type" value="${params.type}"/>
  <g:hiddenField name="max" value="${params.max ?: 10}"/>
+
  <div class="box">
  <h2><warehouse:message code="default.filters.label"/></h2>
  <table>
@@ -81,7 +82,6 @@
  <tr class="prop">
  <td>
  <label><warehouse:message code="order.orderedBy.label"/></label>
-
  <div>
  <g:select id="orderedById" name="orderedById" class="chzn-select-deselect"
  from="${orderedByList}"
@@ -103,6 +103,7 @@
  <a href="javascript:void(0);" id="clearStartDate">clear</a>
  </td>
  </tr>
+
  <tr class="prop">
  <td>
  <label class="block">${warehouse.message(code: 'default.lastUpdatedBefore.label', default: 'Last updated before')}</label>
@@ -112,13 +113,9 @@
  value="${statusEndDate}" format="MM/dd/yyyy"/>
  </div>
  <a href="javascript:void(0);" id="clearEndDate">clear</a>
-
  </td>
  </tr>
 
-
-
-
  <tr class="prop">
  <td colspan="2">
  <div class="center">
@@ -136,11 +133,4 @@
  </table>
  </div>
  </g:form>
-</div>
-
-
-
-
-
-
-
+</div>
diff --git a/grails-app/views/order/_summary.gsp b/grails-app/views/order/_summary.gsp
@@ -240,4 +240,3 @@
  </g:link>
  </div>
 </div>
-