Merge branch 'r-1902001-01' into foodcourt

2020-08-04 11:45:01 +06:30
parent 9a17ab5d9b ffb8e56031
commit 82925881f7
43 changed files with 401 additions and 970 deletions
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -77,7 +77,7 @@
                  <th><%= t("views.right_panel.detail.receipt_no") %></th>
                  <th><%= t("views.right_panel.detail.credit_amount") %></th>
                  <th><%= t :cashier %></th>
-                  <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                  <th><%= t :customer %></th>
                  <th><%= t("views.right_panel.detail.order_source") %></th>
                  <th><%= t("views.right_panel.detail.receipt_date") %></th>
                </tr>