Merge pull request #6722 from mbauskar/develop
[minor] link formatter fixes for Item and Employee
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index eb83f4c..fc52f5a 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.1.0'
+__version__ = '7.1.1'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 8aee1ba..e63c797 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -1,3 +1,5 @@
+frappe.provide("frappe.treeview_settings")
+
frappe.treeview_settings["Account"] = {
breadcrumbs: "Accounts",
title: __("Chart Of Accounts"),
@@ -33,10 +35,19 @@
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
- depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+ depends_on: 'eval:(!doc.is_group&&doc.account_type=="Stock")',
+ get_query: function() {
+ return {
+ filters:{
+ "company": frappe.treeview_settings.filters["company"]
+ }
+ }
+ }
+ },
{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
description: __("Optional. Sets company's default currency, if not specified.")}
],
+ ignore_fields:["parent_account"],
onrender: function(node) {
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
if (node.data && node.data.balance!==undefined) {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
index 4fa889d..d7f508f 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
@@ -294,7 +294,7 @@
"Current Liabilities": {
"Accounts Payable": {
"Payables": {
- "Advance Paybale to Suppliers": {
+ "Advance Payable to Suppliers": {
"account_type": "Payable"
},
"Consigned Payable": {
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
index 8c049d0..6eab34f 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -23,4 +23,5 @@
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
],
+ ignore_fields:["parent_cost_center"]
}
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index d9bac3c..1ec0abc 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -16,7 +16,7 @@
def get_columns():
return [
- _("Payment Document") + ":Link/DocType:130",
+ _("Payment Document") + "::130",
_("Payment Entry") + ":Dynamic Link/"+_("Payment Document")+":110",
_("Posting Date") + ":Date:100",
_("Cheque/Reference No") + "::120",
diff --git a/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
new file mode 100644
index 0000000..cdc4e1a
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
Binary files differ
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index fb132e7..e68d2c7 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -64,6 +64,15 @@
<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/pos-sales-invoice.png">
+#### Billing Timesheet with Project
+
+If you want to bill employees working on Projects on hourly basis (contract based),
+they can fill out Timesheets which consists their billing rate. When you make a new
+Sales Invoice, select the Project for which the billing is to be made, and the
+corresponding Timesheet entries for that Project will be fetched.
+
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/billing-timesheet-sales-invoice.png">
+
* * *
#### "Pro Forma" Invoice
@@ -80,5 +89,4 @@
ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
This is a fairly common practice. We follow this at Frappe too.
-
{next}
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index 308cf68..5395332 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,
- "autoname": "SH.####",
+ "autoname": "naming_series",
"beta": 0,
"creation": "2015-09-09 16:34:04.960369",
"custom": 0,
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student_group",
"fieldtype": "Link",
"hidden": 0,
@@ -41,6 +43,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "instructor",
"fieldtype": "Link",
"hidden": 0,
@@ -67,6 +70,35 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "default": "SH",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Naming Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "SH",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -91,6 +123,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course",
"fieldtype": "Read Only",
"hidden": 0,
@@ -117,6 +150,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "instructor_name",
"fieldtype": "Read Only",
"hidden": 0,
@@ -143,6 +177,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -167,6 +202,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Today",
"fieldname": "schedule_date",
"fieldtype": "Date",
@@ -193,6 +229,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "room",
"fieldtype": "Link",
"hidden": 0,
@@ -219,6 +256,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_9",
"fieldtype": "Column Break",
"hidden": 0,
@@ -243,6 +281,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "from_time",
"fieldtype": "Time",
"hidden": 0,
@@ -268,6 +307,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_time",
"fieldtype": "Time",
"hidden": 0,
@@ -293,6 +333,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "attendance",
"fieldtype": "Section Break",
"hidden": 0,
@@ -318,6 +359,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "students_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -343,6 +385,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
@@ -376,7 +419,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-07-25 01:25:04.593769",
+ "modified": "2016-10-27 15:36:45.163612",
"modified_by": "Administrator",
"module": "Schools",
"name": "Course Schedule",
@@ -393,6 +436,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/setup/doctype/customer_group/customer_group_tree.js b/erpnext/setup/doctype/customer_group/customer_group_tree.js
new file mode 100644
index 0000000..b52c79c
--- /dev/null
+++ b/erpnext/setup/doctype/customer_group/customer_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Customer Group"] = {
+ ignore_fields:["parent_customer_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group_tree.js b/erpnext/setup/doctype/item_group/item_group_tree.js
new file mode 100644
index 0000000..57afe02
--- /dev/null
+++ b/erpnext/setup/doctype/item_group/item_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Item Group"] = {
+ ignore_fields:["parent_item_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_person/sales_person_tree.js b/erpnext/setup/doctype/sales_person/sales_person_tree.js
index 38d4478..bcdfac9 100644
--- a/erpnext/setup/doctype/sales_person/sales_person_tree.js
+++ b/erpnext/setup/doctype/sales_person/sales_person_tree.js
@@ -1,3 +1,4 @@
+
frappe.treeview_settings["Sales Person"] = {
fields: [
{fieldtype:'Data', fieldname: 'sales_person_name',
diff --git a/erpnext/setup/doctype/territory/territory_tree.js b/erpnext/setup/doctype/territory/territory_tree.js
new file mode 100644
index 0000000..edd11df
--- /dev/null
+++ b/erpnext/setup/doctype/territory/territory_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Territory"] = {
+ ignore_fields:["parent_territory"]
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse_tree.js b/erpnext/stock/doctype/warehouse/warehouse_tree.js
index 0b8106b..b0c0cbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse_tree.js
+++ b/erpnext/stock/doctype/warehouse/warehouse_tree.js
@@ -16,6 +16,7 @@
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __("Child nodes can be only created under 'Group' type nodes")}
],
+ ignore_fields:["parent_warehouse"],
onrender: function(node) {
if (node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">'
