Merge branch 'develop' of https://github.com/frappe/erpnext into payrec
diff --git a/README.md b/README.md
index 8ad696e..ce15e84 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@
---
-### Development install
+### Install
-Use the bench, https://github.com/frappe/frappe-bench.
+Use the bench, https://github.com/frappe/bench
### Admin Login
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index d87456d..4f6bd08 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -112,7 +112,8 @@
entries_add: function(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- this.frm.script_manager.copy_from_first_row("entries", row, ["expense_account", "cost_center"]);
+ this.frm.script_manager.copy_from_first_row("entries", row,
+ ["expense_account", "cost_center", "project_name"]);
},
on_submit: function() {
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index e96dcbb..6cee234 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -287,17 +287,16 @@
'Quantity Requested for Purchase', 'Ordered Qty', 'Actual Qty']]
for item in self.item_dict:
total_qty = sum([flt(d[0]) for d in self.item_dict[item]])
- for item_details in self.item_dict[item]:
- item_list.append([item, item_details[1], item_details[2], item_details[0]])
- item_qty = frappe.db.sql("""select warehouse, indented_qty, ordered_qty, actual_qty
- from `tabBin` where item_code = %s""", item, as_dict=1)
- i_qty, o_qty, a_qty = 0, 0, 0
- for w in item_qty:
- i_qty, o_qty, a_qty = i_qty + flt(w.indented_qty), o_qty + flt(w.ordered_qty), a_qty + flt(w.actual_qty)
- item_list.append(['', '', '', '', w.warehouse, flt(w.indented_qty),
- flt(w.ordered_qty), flt(w.actual_qty)])
- if item_qty:
- item_list.append(['', '', '', '', 'Total', i_qty, o_qty, a_qty])
+ item_list.append([item, self.item_dict[item][0][1], self.item_dict[item][0][2], total_qty])
+ item_qty = frappe.db.sql("""select warehouse, indented_qty, ordered_qty, actual_qty
+ from `tabBin` where item_code = %s""", item, as_dict=1)
+ i_qty, o_qty, a_qty = 0, 0, 0
+ for w in item_qty:
+ i_qty, o_qty, a_qty = i_qty + flt(w.indented_qty), o_qty + flt(w.ordered_qty), a_qty + flt(w.actual_qty)
+ item_list.append(['', '', '', '', w.warehouse, flt(w.indented_qty),
+ flt(w.ordered_qty), flt(w.actual_qty)])
+ if item_qty:
+ item_list.append(['', '', '', '', 'Total', i_qty, o_qty, a_qty])
return item_list
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 066e3b5..8b17ca3 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -312,7 +312,7 @@
def get_todo_list(self, user_id):
todo_list = frappe.db.sql("""select *
- from `tabToDo` where (owner=%s or assigned_by=%s)
+ from `tabToDo` where (owner=%s or assigned_by=%s) and status="Open"
order by field(priority, 'High', 'Medium', 'Low') asc, date asc""",
(user_id, user_id), as_dict=True)