Merge branch 'r-1902001-01' into foodcourt

app/views/layouts/inventory.html.erb

@@ -31,14 +31,15 @@
             <p>Please wait...</p>
         </div>
     </div>
+    <%= render 'shared/license_expire_warning' if Rails.env.production? %>
     <!-- #END# Page Loader -->
     <!-- Overlay For Sidebars -->
     <div class="overlay"></div>
     <!-- #END# Overlay For Sidebars -->
     <%= render 'layouts/header' %>
-    <section>      
-        <%= render 'layouts/left_sidebar' %>  
-        <%= render 'layouts/right_sidebar' %>  
+    <section>
+        <%= render 'layouts/left_sidebar' %>
+        <%= render 'layouts/right_sidebar' %>
     </section>
 
     <!-- Main Content -->
@@ -54,8 +55,8 @@
       <% end %>
         <%= render_breadcrumb %>
 
-        <%= yield %>     
+        <%= yield %>
     </section>
 </body>
 
-</html>
+</html>