From 8f9e631a447bbd5fa666e5c42e54d641e3e9babd Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 26 Feb 2015 20:27:41 +0530 Subject: [PATCH] minor fixes --- README.md | 2 +- erpnext/patches/v5_0/update_projects.py | 3 ++- erpnext/public/js/conf.js | 2 +- erpnext/templates/includes/product_in_grid.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f2b628eda58..ac03c502e4d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Requires ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & Javascript. -- [User Guide](https://erpnext.com/user-guide) +- [User Guide](https://manual.erpnext.com) - [Getting Help](http://erpnext.org/getting-help.html) - [Discussion Forum](https://discuss.frappe.io/) diff --git a/erpnext/patches/v5_0/update_projects.py b/erpnext/patches/v5_0/update_projects.py index 29300e5b40e..f49bc666fde 100644 --- a/erpnext/patches/v5_0/update_projects.py +++ b/erpnext/patches/v5_0/update_projects.py @@ -5,7 +5,8 @@ def execute(): frappe.reload_doctype("Project") for m in frappe.get_all("Project Milestone", "*"): - if m.milestone and m.milestone_date: + if (m.milestone and m.milestone_date + and frappe.db.exists("Project", m.parent)): frappe.get_doc({ "doctype": "Task", "subject": m.milestone, diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index b76cfaee019..19f68b53cdf 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -9,7 +9,7 @@ $(document).bind('toolbar_setup', function() { $('.navbar-home').html('ERPNext'); - $('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide") + $('[data-link="docs"]').attr("href", "https://manual.erpnext.com") }); // doctypes created via tree diff --git a/erpnext/templates/includes/product_in_grid.html b/erpnext/templates/includes/product_in_grid.html index 2a35fb8d5bf..854f77f506b 100644 --- a/erpnext/templates/includes/product_in_grid.html +++ b/erpnext/templates/includes/product_in_grid.html @@ -3,6 +3,6 @@
{{ product_image_square(website_image) }} -
{{ item_name }}
+
{{ item_name }}