Merge branch 'master' into settings_backend

2017-06-23 09:14:32 +06:30
parent 298a06fc1e a90bbbebec
commit dfdbc1bfcc
32 changed files with 328 additions and 175 deletions
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -180,7 +180,7 @@
                     if @sale_array.size > 1
                     unless sale.receipt_no == @sale_array[0].receipt_no
                     %>
-                      Pending New Invoice
+                      Pending Payment
                       <table class="table table-striped">
                         <tr>
                           <td>Receipt No - <%= sale.receipt_no %></td>