Merge pull request #4146 from nabinhait/fix10
[fix] Multiple minor fixes
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 1eaf8a7..381e4d4 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -51,7 +51,8 @@
# sales team
if party_type=="Customer":
out["sales_team"] = [{
- "sales_person": d.sales_person
+ "sales_person": d.sales_person,
+ "allocated_percentage": d.allocated_percentage or None
} for d in party.get("sales_team")]
return out
diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json
index a108ae6..1affa13 100644
--- a/erpnext/projects/doctype/project_task/project_task.json
+++ b/erpnext/projects/doctype/project_task/project_task.json
@@ -19,7 +19,7 @@
"in_filter": 0,
"in_list_view": 1,
"label": "Title",
- "no_copy": 1,
+ "no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -217,7 +217,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-09-11 12:19:41.832529",
+ "modified": "2015-10-12 06:24:11.748792",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project Task",
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 1a86b2b..9173b71 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -20,7 +20,10 @@
price_list: frm.doc.buying_price_list
};
}
- args.posting_date = frm.doc.transaction_date;
+
+ if (args) {
+ args.posting_date = frm.doc.transaction_date;
+ }
}
if(!args) return;