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

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Anand Doshi 2013-04-03 13:46:10 +05:30
commit 56bac218f5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -750,6 +750,7 @@ class DocType(SellingController):
for item in self.doclist.get({"parentfield": "entries"}): for item in self.doclist.get({"parentfield": "entries"}):
self.check_expense_account(item) self.check_expense_account(item)
if item.buying_amount:
gl_entries += self.get_gl_entries_for_stock(item.expense_account, gl_entries += self.get_gl_entries_for_stock(item.expense_account,
-1*item.buying_amount, cost_center=item.cost_center) -1*item.buying_amount, cost_center=item.cost_center)

1
stock/doctype/delivery_note/delivery_note.py
View File

@ -415,6 +415,7 @@ class DocType(SellingController):
for item in self.doclist.get({"parentfield": "delivery_note_details"}): for item in self.doclist.get({"parentfield": "delivery_note_details"}):
self.check_expense_account(item) self.check_expense_account(item)
if item.buying_amount:
gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount, gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount,
cost_center=item.cost_center) cost_center=item.cost_center)