resolved merge conflicts

2017-09-14 15:32:10 +05:30
parent beb2f3c415 fd39e6f3c8
commit ea832b8157
17 changed files with 66 additions and 26 deletions
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -177,6 +177,7 @@ def set_defaults(args):
 	selling_settings.so_required = "No"
 	selling_settings.dn_required = "No"
 	selling_settings.allow_multiple_items = 1
+	selling_settings.set_default_customer_group_and_territory()
 	selling_settings.save()

 	buying_settings = frappe.get_doc("Buying Settings")