Shiloh/brotherton-erpnext
1
0
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

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

@ -750,8 +750,9 @@ class DocType(SellingController):
for item in self.doclist.get({"parentfield": "entries"}):
self.check_expense_account(item)
gl_entries += self.get_gl_entries_for_stock(item.expense_account,
-1*item.buying_amount, cost_center=item.cost_center)
if item.buying_amount:
gl_entries += self.get_gl_entries_for_stock(item.expense_account,
-1*item.buying_amount, cost_center=item.cost_center)
def make_pos_gl_entries(self, gl_entries):
if cint(self.doc.is_pos) and self.doc.cash_bank_account and self.doc.paid_amount:

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

@ -415,8 +415,9 @@ class DocType(SellingController):
for item in self.doclist.get({"parentfield": "delivery_note_details"}):
self.check_expense_account(item)
gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount,
cost_center=item.cost_center)
if item.buying_amount:
gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount,
cost_center=item.cost_center)
if gl_entries:
from accounts.general_ledger import make_gl_entries