diff --git a/.travis.yml b/.travis.yml index 8681c03f55..4182a12386 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,4 +64,10 @@ jobs: - bench execute erpnext.setup.utils.enable_all_roles_and_domains - bench run-ui-tests --app erpnext env: Client Side Test + - # stage + script: + - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz + - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + - bench migrate + env: Patch Testing diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bc63f4a794..25a164071c 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -334,6 +334,7 @@ execute:frappe.reload_doctype('Employee') #2016-10-18 execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ") execute:frappe.reload_doctype("Salary Slip") execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation") +execute:frappe.reload_doc("stock", "doctype", "stock_settings") erpnext.patches.v8_0.create_domain_docs #16-05-2017 erpnext.patches.v7_1.update_portal_roles erpnext.patches.v7_1.set_total_amount_currency_in_je diff --git a/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py b/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py index e7833c0f5c..c150cfa3e2 100644 --- a/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py +++ b/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py @@ -7,7 +7,9 @@ import frappe def execute(): doctype = 'POS Profile' frappe.reload_doc('accounts', 'doctype', doctype) - frappe.reload_doc('accounts', 'doctype', 'POS Profile User') + frappe.reload_doc('accounts', 'doctype', 'pos_profile_user') + frappe.reload_doc('accounts', 'doctype', 'pos_item_group') + frappe.reload_doc('accounts', 'doctype', 'pos_customer_group') for doc in frappe.get_all(doctype): _doc = frappe.get_doc(doctype, doc.name) @@ -19,4 +21,7 @@ def execute(): 'user': user }) _doc.pos_profile_name = user + ' - ' + _doc.company + _doc.flags.ignore_validate = True + _doc.flags.ignore_mandatory = True _doc.save() + diff --git a/erpnext/patches/v9_0/student_admission_childtable_migrate.py b/erpnext/patches/v9_0/student_admission_childtable_migrate.py index dcbbeebcaf..76b946d637 100644 --- a/erpnext/patches/v9_0/student_admission_childtable_migrate.py +++ b/erpnext/patches/v9_0/student_admission_childtable_migrate.py @@ -5,8 +5,8 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.reload_doc('schools', 'doctype', 'Student Admission Program') - frappe.reload_doctype('Student Admission') + frappe.reload_doc('schools', 'doctype', 'student_admission_program') + frappe.reload_doc('schools', 'doctype', 'student_admission') if "program" not in frappe.db.get_table_columns("Student Admission"): return