From 65d12926fdb2f4056ba21af89274a0693a4ed63d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 26 Jun 2013 22:31:22 +0530 Subject: [PATCH 1/2] [setup] bug fixes --- buying/doctype/buying_settings/buying_settings.py | 2 +- controllers/js/contact_address_common.js | 6 +++++- setup/doctype/setup_control/setup_control.py | 2 +- setup/page/setup/setup.js | 12 ++++++------ setup/page/setup/setup.py | 6 ++++++ stock/doctype/item/item.txt | 3 ++- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/buying/doctype/buying_settings/buying_settings.py b/buying/doctype/buying_settings/buying_settings.py index 7a97349f22..b00bcef42f 100644 --- a/buying/doctype/buying_settings/buying_settings.py +++ b/buying/doctype/buying_settings/buying_settings.py @@ -8,6 +8,6 @@ class DocType: 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 ca9e084f5c..89b1d43ac5 100644 --- a/controllers/js/contact_address_common.js +++ b/controllers/js/contact_address_common.js @@ -15,12 +15,16 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { 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 9cb0c482db..eb668a7556 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -119,7 +119,7 @@ class DocType: 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 04a8d48517..908718815c 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -73,11 +73,6 @@ wn.pages['Setup'].onload = function(wrapper) { +'') .appendTo(row); - if(dependency) - col.addClass("col-offset-1"); - else - $('
').appendTo(row); - col.find(".badge") .css({ "background-color": (item.count ? "green" : "orange"), @@ -89,13 +84,18 @@ wn.pages['Setup'].onload = function(wrapper) { if(item.count) completed += 1; } + + if(dependency) + col.addClass("col-offset-1"); + else + $('
').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 ab2cdb7384..96cd6e4bdb 100644 --- a/setup/page/setup/setup.py +++ b/setup/page/setup/setup.py @@ -38,6 +38,8 @@ items = [ {"doctype":"UOM"}, {"doctype":"Brand"}, {"doctype":"Price List"}, + { "title": "Stock Settings", + "route": "Form/Stock Settings", "type": "Link", "icon": "icon-cog" }, ], }, { @@ -48,6 +50,8 @@ items = [ {"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 @@ items = [ {"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 e23bbe053e..1273b12420 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", From e6d986adea480743f2b3a4571fdffd930135b60e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Jun 2013 10:54:49 +0530 Subject: [PATCH 2/2] [import] fixes --- setup/page/setup/setup.py | 1 + stock/doctype/item/item.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/page/setup/setup.py b/setup/page/setup/setup.py index 444c5c3bbc..10fc2a4913 100644 --- a/setup/page/setup/setup.py +++ b/setup/page/setup/setup.py @@ -115,6 +115,7 @@ items = [ "title": "Printing", "icon": "icon-print" }, + { "doctype": "Terms and Conditions" }, { "doctype": "Letter Head" }, { "doctype": "Print Heading" }, { "doctype": "Print Format", "filter": {"standard": "No"} }, diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index d743a98005..09a5ce6526 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -32,7 +32,7 @@ class DocType(DocListController): from webnotes.model.doc import make_autoname self.doc.item_code = make_autoname(self.doc.naming_series+'.#####') elif not self.doc.item_code: - msgprint(_("Item Code is mandatory"), raise_exception=1) + msgprint(_("Item Code (item_code) is mandatory because Item naming is not sequential."), raise_exception=1) self.doc.name = self.doc.item_code