Merge pull request #3679 from neilLasrado/freeze-customer
Added ability to freeze Customer/Supplier
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index b38bd1c..ac720c9 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -29,7 +29,7 @@
erpnext.wiz.taxes.slide,
erpnext.wiz.customers.slide,
erpnext.wiz.suppliers.slide,
- erpnext.wiz.items.slide,
+ erpnext.wiz.items.slide
]
}
@@ -406,7 +406,6 @@
description: __('Your financial year begins on'), reqd:1},
{fieldname:'fy_end_date', label:__('Financial Year End Date'), fieldtype:'Date',
description: __('Your financial year ends on'), reqd:1},
-
],
help: __('The name of your company for which you are setting up this system.'),
@@ -510,7 +509,7 @@
slide: {
icon: "icon-money",
"title": __("Add Users"),
- "help": __("Add users to your organization"),
+ "help": __("Add users to your organization, other than yourself"),
"fields": [],
before_load: function(slide) {
slide.fields = [];
@@ -635,6 +634,11 @@
])
}
slide.fields[1].reqd = 1;
+
+ // dummy data
+ slide.fields.push({fieldtype: "Section Break"});
+ slide.fields.push({fieldtype: "Check", fieldname: "add_sample_data",
+ label: __("Add a few sample records"), "default": 1});
},
css_class: "two-column"
},
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 812a9f1..e8c7699 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -86,10 +86,11 @@
frappe.clear_cache()
- try:
- make_sample_data()
- except FiscalYearError:
- pass
+ if args.get("add_sample_data"):
+ try:
+ make_sample_data()
+ except FiscalYearError:
+ pass
except:
if args:
traceback = frappe.get_traceback()
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index cabbdae..fd36d47 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -222,6 +222,7 @@
"permlevel": 0
},
{
+ "depends_on": "customer",
"fieldname": "contact_info",
"fieldtype": "Section Break",
"label": "Contact Info",
@@ -396,7 +397,7 @@
"icon": "icon-bug",
"idx": 1,
"is_submittable": 0,
- "modified": "2015-02-21 04:11:40.653543",
+ "modified": "2015-07-28 11:59:38.762393",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",