Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/buying/doctype/buying_settings/buying_settings.py b/buying/doctype/buying_settings/buying_settings.py
index 7a97349..b00bcef 100644
--- a/buying/doctype/buying_settings/buying_settings.py
+++ b/buying/doctype/buying_settings/buying_settings.py
@@ -8,6 +8,6 @@
self.doc, self.doclist = d, dl
def validate(self):
- for key in ["supplier_type", "maintain_same_rate"]:
+ for key in ["supplier_type", "supp_master_name", "maintain_same_rate"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))
\ No newline at end of file
diff --git a/controllers/js/contact_address_common.js b/controllers/js/contact_address_common.js
index ca9e084..89b1d43 100644
--- a/controllers/js/contact_address_common.js
+++ b/controllers/js/contact_address_common.js
@@ -15,12 +15,16 @@
var refdoc = wn.model.get_doc(last_route[1], last_route[2]);
cur_frm.set_value("customer", refdoc.customer || refdoc.name);
cur_frm.set_value("customer_name", refdoc.customer_name);
+ if(cur_frm.doc.doctype==="Address")
+ cur_frm.set_value("address_title", cur_frm.doc.customer)
}
if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
.indexOf(last_route[1])!==-1) {
- var customer = wn.model.get_doc(last_route[1], last_route[2]);
+ var refdoc = wn.model.get_doc(last_route[1], last_route[2]);
cur_frm.set_value("supplier", refdoc.supplier || refdoc.name);
cur_frm.set_value("supplier_name", refdoc.supplier_name);
+ if(cur_frm.doc.doctype==="Address")
+ cur_frm.set_value("address_title", cur_frm.doc.supplier)
}
}
}
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 9cb0c48..eb668a7 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -119,7 +119,7 @@
stock_settings.save()
selling_settings = webnotes.bean("Selling Settings")
- selling_settings.cust_master_name = "Customer Name"
+ selling_settings.doc.cust_master_name = "Customer Name"
selling_settings.doc.so_required = "No"
selling_settings.doc.dn_required = "No"
selling_settings.save()
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index 04a8d48..9087188 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -73,11 +73,6 @@
+'</div>')
.appendTo(row);
- if(dependency)
- col.addClass("col-offset-1");
- else
- $('<div class="col col-lg-1"></div>').appendTo(row);
-
col.find(".badge")
.css({
"background-color": (item.count ? "green" : "orange"),
@@ -89,13 +84,18 @@
if(item.count)
completed += 1;
}
+
+ if(dependency)
+ col.addClass("col-offset-1");
+ else
+ $('<div class="col col-lg-1"></div>').appendTo(row);
if(item.doctype) {
col.find(".badge")
.attr("data-doctype", item.doctype)
.css({"cursor": "pointer"})
.click(function() {
- wn.set_route("List", $(this).attr("data-doctype"))
+ wn.set_route(item.tree || "List", $(this).attr("data-doctype"))
})
}
diff --git a/setup/page/setup/setup.py b/setup/page/setup/setup.py
index 1a467c3..444c5c3 100644
--- a/setup/page/setup/setup.py
+++ b/setup/page/setup/setup.py
@@ -38,6 +38,8 @@
{"doctype":"UOM"},
{"doctype":"Brand"},
{"doctype":"Price List"},
+ { "title": "Stock Settings",
+ "route": "Form/Stock Settings", "type": "Link", "icon": "icon-cog" },
],
},
{
@@ -48,6 +50,8 @@
{"doctype":"Sales Person", "tree": "Sales Browser"},
{"doctype":"Contact"},
{"doctype":"Address"},
+ { "title": "Selling Settings",
+ "route": "Form/Selling Settings", "type": "Link", "icon": "icon-cog" },
]
},
{
@@ -56,6 +60,8 @@
{"doctype":"Supplier Type"},
{"doctype":"Contact"},
{"doctype":"Address"},
+ { "title": "Buying Settings",
+ "route": "Form/Buying Settings", "type": "Link", "icon": "icon-cog" },
]
},
{
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index e23bbe0..1273b12 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
- "modified": "2013-06-13 16:17:42",
+ "modified": "2013-06-26 21:39:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -838,6 +838,7 @@
"read_only": 0
},
{
+ "depends_on": "show_in_website",
"doctype": "DocField",
"fieldname": "copy_from_item_group",
"fieldtype": "Button",