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

Merge branch 'develop' of https://github.com/frappe/erpnext into payrec

Browse Source
This commit is contained in:
ankitjavalkarwork 2014-07-24 15:15:12 +05:30
commit 344dd3793a
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -13,9 +13,9 @@ ERPNext is built on [frappe](https://github.com/frappe/frappe)
--- ---
### Development install ### Install
Use the bench, https://github.com/frappe/frappe-bench. Use the bench, https://github.com/frappe/bench
### Admin Login ### Admin Login

3
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -112,7 +112,8 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
entries_add: function(doc, cdt, cdn) { entries_add: function(doc, cdt, cdn) {
var row = frappe.get_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() { on_submit: function() {

21
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@ -287,17 +287,16 @@ class ProductionPlanningTool(Document):
'Quantity Requested for Purchase', 'Ordered Qty', 'Actual Qty']] 'Quantity Requested for Purchase', 'Ordered Qty', 'Actual Qty']]
for item in self.item_dict: for item in self.item_dict:
total_qty = sum([flt(d[0]) for d in self.item_dict[item]]) 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, self.item_dict[item][0][1], self.item_dict[item][0][2], total_qty])
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
item_qty = frappe.db.sql("""select warehouse, indented_qty, ordered_qty, actual_qty from `tabBin` where item_code = %s""", item, as_dict=1)
from `tabBin` where item_code = %s""", item, as_dict=1) i_qty, o_qty, a_qty = 0, 0, 0
i_qty, o_qty, a_qty = 0, 0, 0 for w in item_qty:
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)
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),
item_list.append(['', '', '', '', w.warehouse, flt(w.indented_qty), flt(w.ordered_qty), flt(w.actual_qty)])
flt(w.ordered_qty), flt(w.actual_qty)]) if item_qty:
if item_qty: item_list.append(['', '', '', '', 'Total', i_qty, o_qty, a_qty])
item_list.append(['', '', '', '', 'Total', i_qty, o_qty, a_qty])
return item_list return item_list

2
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -312,7 +312,7 @@ class EmailDigest(Document):
def get_todo_list(self, user_id): def get_todo_list(self, user_id):
todo_list = frappe.db.sql("""select * 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""", order by field(priority, 'High', 'Medium', 'Low') asc, date asc""",
(user_id, user_id), as_dict=True) (user_id, user_id), as_dict=True)