fixed translation for setup-wizard and removed purchase validation for Material Request #925
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index 9bddf51..842645c 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -32,7 +32,7 @@
var d = msgprint(__("There were errors."));
d.custom_onhide = function() {
frappe.set_route(erpnext.wiz.page_name, "0");
- }
+ };
}
})
},
@@ -42,16 +42,16 @@
<p class="text-center" style="margin: 0px 100px">' +
__('Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!') +
'</p>',
- working_html: '<h3 class="text-muted text-center"><i class="icon-refresh icon-spin"></i></h3>\
+ working_html: function() { return '<h3 class="text-muted text-center"><i class="icon-refresh icon-spin"></i></h3>\
<h2 class="text-center">'+__('Setting up...')+'</h2>\
<p class="text-center">' +
__('Sit tight while your system is being setup. This may take a few moments.') +
- '</p>',
- complete_html: '<h1 class="text-muted text-center"><i class="icon-thumbs-up"></i></h1>\
+ '</p>' },
+ complete_html: function() { return '<h1 class="text-muted text-center"><i class="icon-thumbs-up"></i></h1>\
<h2 class="text-center">'+__('Setup Complete!')+'</h2>\
<p class="text-center">' +
__('Your setup is complete. Refreshing...') +
- '</p>',
+ '</p>'},
slides: [
// User
{
@@ -373,11 +373,11 @@
show_working: function() {
this.hide_current_slide();
frappe.set_route(this.page_name);
- this.current_slide = {"$wrapper": this.get_message(this.working_html).appendTo(this.parent)};
+ this.current_slide = {"$wrapper": this.get_message(this.working_html()).appendTo(this.parent)};
},
show_complete: function() {
this.hide_current_slide();
- this.current_slide = {"$wrapper": this.get_message(this.complete_html).appendTo(this.parent)};
+ this.current_slide = {"$wrapper": this.get_message(this.complete_html()).appendTo(this.parent)};
},
show: function(id) {
if(!this.welcomed) {
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index ef233ce..be97228 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -104,7 +104,7 @@
elif item.is_sales_item != "Yes":
throw(_("Item {0} must be a Sales Item").format(item.name))
- elif args.transaction_type == "buying":
+ elif args.transaction_type == "buying" and args.doctype != "Material Request":
# validate if purchase item or subcontracted item
if item.is_purchase_item != "Yes":
throw(_("Item {0} must be a Purchase Item").format(item.name))