From 876d868fa13aa03ed1c3adf3b017264537165033 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Tue, 15 Jan 2019 15:45:33 +0530
Subject: [PATCH] fix(tests): change patch order, optimise travis

---
 .travis.yml         | 11 +++++------
 erpnext/patches.txt |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 448cd40a39..e21d59511a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,17 +30,16 @@ before_script:
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench use test_site
-  - bench reinstall --yes
-  - bench build
-  - bench scheduler disable
-  - sed -i 's/9000/9001/g' sites/common_site_config.json
-  - bench start &
-  - sleep 10
 
 jobs:
   include:
     - stage: test
       script:
+        - bench reinstall --yes
+        - bench scheduler disable
+        - sed -i 's/9000/9001/g' sites/common_site_config.json
+        - bench start &
+        - sleep 10
         - set -e
         - bench run-tests
       env: Server Side Test
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index bc6f99db84..9d5b331123 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,5 +1,6 @@
 execute:import unidecode # new requirement
 erpnext.patches.v8_0.move_perpetual_inventory_setting
+erpnext.patches.v8_9.set_print_zero_amount_taxes
 erpnext.patches.v10_0.rename_schools_to_education
 erpnext.patches.v4_0.validate_v3_patch
 erpnext.patches.v4_0.fix_employee_user_id
@@ -442,7 +443,6 @@ erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017 #22-11-2
 erpnext.patches.v8_9.rename_company_sales_target_field
 erpnext.patches.v8_8.set_bom_rate_as_per_uom
 erpnext.patches.v8_8.add_new_fields_in_accounts_settings
-erpnext.patches.v8_9.set_print_zero_amount_taxes
 erpnext.patches.v8_9.set_default_customer_group
 erpnext.patches.v8_9.remove_employee_from_salary_structure_parent
 erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts