Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Anand Doshi 2015-02-26 20:27:41 +05:30
parent 851c745fdf
commit 8f9e631a44
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. 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) - [Getting Help](http://erpnext.org/getting-help.html)
- [Discussion Forum](https://discuss.frappe.io/) - [Discussion Forum](https://discuss.frappe.io/)

3
erpnext/patches/v5_0/update_projects.py
View File

@ -5,7 +5,8 @@ def execute():
frappe.reload_doctype("Project") frappe.reload_doctype("Project")
for m in frappe.get_all("Project Milestone", "*"): 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({ frappe.get_doc({
"doctype": "Task", "doctype": "Task",
"subject": m.milestone, "subject": m.milestone,

2
erpnext/public/js/conf.js
View File

@ -9,7 +9,7 @@ $(document).bind('toolbar_setup', function() {
$('.navbar-home').html('ERPNext'); $('.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 // doctypes created via tree

2
erpnext/templates/includes/product_in_grid.html
View File

@ -3,6 +3,6 @@
<a class="product-link" href="{{ route or page_name }}"> <a class="product-link" href="{{ route or page_name }}">
<div class="col-sm-2 col-xs-4 product-image-wrapper"> <div class="col-sm-2 col-xs-4 product-image-wrapper">
{{ product_image_square(website_image) }} {{ product_image_square(website_image) }}
<div class="text-ellipsis small product-text">{{ item_name }}</div> <div class="text-ellipsis inline-block small product-text">{{ item_name }}</div>
</div> </div>
</a> </a>