merge with august_spring

2017-09-06 18:32:45 +06:30
parent a9d31935a1 2e53b72574
commit a50becb365
50 changed files with 1761 additions and 986 deletions
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -36,3 +36,7 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
+
+# --- Inventory Definition ----
+Rails.application.config.assets.precompile += %w( inventory_definitions.css )
+