")
+ this.$wrapper = $('
')
.appendTo(this.wiz.parent)
.attr("data-slide-id", this.id);
},
@@ -305,10 +305,11 @@ $.extend(erpnext.wiz, {
$timezone.empty();
// add country specific timezones first
- if(country){
+ if(country) {
var timezone_list = data.country_info[country].timezones || [];
$timezone.add_options(timezone_list.sort());
slide.get_field("currency").set_input(data.country_info[country].currency);
+ slide.get_field("currency").$input.trigger("change");
}
// add all timezones at the end, so that user has the option to change it to any timezone
@@ -320,6 +321,23 @@ $.extend(erpnext.wiz, {
frappe.boot.sysdefaults.date_format = (data.country_info[country].date_format
|| "dd-mm-yyyy");
});
+
+ slide.get_input("currency").on("change", function() {
+ var currency = slide.get_input("currency").val();
+ frappe.model.with_doc("Currency", currency, function() {
+ frappe.provide("locals.:Currency." + currency);
+ var currency_doc = frappe.model.get_doc("Currency", currency);
+ var number_format = currency_doc.number_format;
+ if (number_format==="#.###") {
+ number_format = "#.###,##";
+ } else if (number_format==="#,###") {
+ number_format = "#,###.##"
+ }
+
+ frappe.boot.sysdefaults.number_format = number_format;
+ locals[":Currency"][currency] = $.extend({}, currency_doc);
+ });
+ });
}
},
@@ -585,14 +603,7 @@ $.extend(erpnext.wiz, {
callback: function(r) {
wiz.show_complete();
setTimeout(function() {
- if(user==="Administrator") {
- msgprint(__("Login with your new User ID") + ": " + values.email);
- setTimeout(function() {
- frappe.app.logout();
- }, 2000);
- } else {
- window.location = "/desk";
- }
+ window.location = "/desk";
}, 2000);
},
error: function(r) {
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 445aa3dc870..31dd03d56f0 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -75,6 +75,8 @@ def setup_account(args=None):
website_maker(args.company_name.strip(), args.company_tagline, args.name)
create_logo(args)
+ login_as_first_user(args)
+
frappe.clear_cache()
frappe.db.commit()
@@ -432,6 +434,11 @@ def create_territories():
"is_group": "No"
}).insert()
+def login_as_first_user(args):
+ if args.get("email") and hasattr(frappe.local, "login_manager"):
+ frappe.local.login_manager.user = args.get("email")
+ frappe.local.login_manager.post_login()
+
@frappe.whitelist()
def load_messages(language):
frappe.clear_cache()
@@ -444,8 +451,6 @@ def load_messages(language):
@frappe.whitelist()
def load_languages():
- from frappe.sessions import get_geo_from_ip
-
return {
"default_language": get_language_from_code(frappe.local.lang),
"languages": sorted(get_lang_dict().keys())
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index 173ed6791b6..1b9bca3eca2 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -1,12 +1,13 @@
frappe.listview_settings['Material Request'] = {
add_fields: ["material_request_type", "status", "per_ordered"],
- get_status: function(doc) {
+ get_indicator: function(doc) {
+ console.log()
if(doc.status=="Stopped") {
return [__("Stopped"), "red", "status,=,Stopped"];
- } if(doc.docstatus==1 && doc.per_ordered < 100) {
+ } else if(doc.docstatus==1 && doc.per_ordered < 100) {
return [__("Pending"), "orange", "per_ordered,<,100"];
- } else if(doc.status==1 && doc.per_ordered == 100) {
- return [__("Completed"), "green", "per_ordered,=,100"];
+ } else if(doc.docstatus==1 && doc.per_ordered == 100) {
+ return [__("Ordered"), "green", "per_ordered,=,100"];
}
}
};
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index 3349559ca53..a944d20ef13 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -27,6 +27,7 @@
"fieldname": "price_list_name",
"fieldtype": "Data",
"label": "Price List Name",
+ "no_copy": 1,
"oldfieldname": "price_list_name",
"oldfieldtype": "Data",
"permlevel": 0,
@@ -74,7 +75,7 @@
"icon": "icon-tags",
"idx": 1,
"max_attachments": 1,
- "modified": "2015-02-05 05:11:42.450750",
+ "modified": "2015-02-12 17:39:02.825767",
"modified_by": "Administrator",
"module": "Stock",
"name": "Price List",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index bc1b94aa810..9395e84fcf6 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -286,7 +286,7 @@ class PurchaseReceipt(BuyingController):
if d.item_code in stock_items and flt(d.valuation_rate) and flt(d.qty):
if warehouse_account.get(d.warehouse):
- val_rate_db_precision = 6 if cint(self.precision("valuation_rate")) <= 6 else 9
+ val_rate_db_precision = 6 if cint(d.precision("valuation_rate")) <= 6 else 9
# warehouse account
gl_entries.append(self.get_gl_dict({
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index cc7169bf85c..a77aa748ea6 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -122,7 +122,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
clean_up: function() {
// Clear Production Order record from locals, because it is updated via Stock Entry
if(this.frm.doc.production_order &&
- this.frm.doc.purpose == "Manufacture") {
+ in_list(["Manufacture", "Material Transfer for Manufacture"], this.frm.doc.purpose)) {
frappe.model.remove_from_locals("Production Order",
this.frm.doc.production_order);
}
@@ -164,7 +164,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
},
toggle_enable_bom: function() {
- this.frm.toggle_enable("bom_no", this.frm.doc.purpose!="Manufacture");
+ this.frm.toggle_enable("bom_no", !in_list(["Manufacture", "Material Transfer for Manufacture"], this.frm.doc.purpose));
},
get_doctype_docname: function() {
@@ -233,8 +233,10 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
},
- source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"],
- target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"],
+ source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract",
+ "Material Transfer for Manufacture"],
+ target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract",
+ "Material Transfer for Manufacture"],
from_warehouse: function(doc) {
var me = this;
@@ -251,6 +253,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
},
set_warehouse_if_missing: function(fieldname, value, condition) {
+ var changed = false;
for (var i=0, l=(this.frm.doc.items || []).length; i
" + col + ""; }
- : function(col) { return "" + col + " | "; };
-
- $.each(data, function(i, row) {
- result += ""
- + $.map(row, _render).join("")
- + "
";
- });
- return result;
- };
-
- var $reconciliation_table = $("\
-
\
- " + _make([reconciliation_data[0]], true) + "\
- " + _make(reconciliation_data.splice(1)) + "\
-
\
-
{%= doc.item_name %}{% } %}
{% if(doc.item_name != doc.description) { %}
{%= doc.description %}
{% } %}
-
+
{% if(doc.sales_order || doc.against_sales_order) { %}
-
{%= doc.sales_order || doc.against_sales_order %}
@@ -36,22 +36,28 @@
}
}
%}
-
{%= doc.warehouse %}
{% } %}
-
- {%= doc.get_formatted("schedule_date") %}
-
+
+
+ {% if(frappe.datetime.get_diff(doc.schedule_date) < 1 && doc.received_qty < doc.qty) { %}
+
+ {%= __("Overdue on {0}", [doc.get_formatted("schedule_date")]) %}
+
+ {% } else { %}
+
+ {%= __("Due on {0}", [doc.get_formatted("schedule_date")]) %}
+
+ {% } %}
+
{% } %}
{%= doc.get_formatted("qty") %}
-
{%= doc.uom || doc.stock_uom %}
- {% var completed =
- 100 - cint((doc.qty - cint(doc.ordered_qty)) * 100 / doc.qty),
- title = __("Ordered"); %}
- {% include "templates/form_grid/includes/progress.html" %}
- {% if(doc.warehouse) { %}
-
-
- {%= doc.warehouse %}
-
-
+
{%= doc.uom || doc.stock_uom %}
+ {% if(doc.qty == doc.ordered_qty) { %}
+
{%= __("Ordered") %}
+ {% } else { %}
+
{%= __("{0} Ordered", doc.ordered_qty) %}
{% } %}