fixes for gl entries in purchase invoice
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py
index 4d582e3..e96ff6b 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -451,7 +451,7 @@
# item gl entries
stock_item_and_auto_accounting = False
for item in self.doclist.get({"parentfield": "entries"}):
- if auto_inventory_accounting and \
+ if auto_inventory_accounting and flt(item.valuation_rate) and \
webnotes.conn.get_value("Item", item.item_code, "is_stock_item")=="Yes":
# if auto inventory accounting enabled and stock item,
# then do stock related gl entries, expense will be booked in sales invoice
@@ -467,7 +467,7 @@
stock_item_and_auto_accounting = True
- else:
+ elif flt(item.amount):
# if not a stock item or auto inventory accounting disabled, book the expense
gl_entries.append(
self.get_gl_dict({
diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py
index 4c40525..7d9a78a 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/accounts/doctype/sales_invoice/sales_invoice.py
@@ -664,15 +664,16 @@
# item gl entries
for item in getlist(self.doclist, 'entries'):
# income account gl entries
- gl_entries.append(
- self.get_gl_dict({
- "account": item.income_account,
- "against": self.doc.debit_to,
- "credit": item.amount,
- "remarks": self.doc.remarks,
- "cost_center": item.cost_center
- }, is_cancel)
- )
+ if flt(item.amount):
+ gl_entries.append(
+ self.get_gl_dict({
+ "account": item.income_account,
+ "against": self.doc.debit_to,
+ "credit": item.amount,
+ "remarks": self.doc.remarks,
+ "cost_center": item.cost_center
+ }, is_cancel)
+ )
# if auto inventory accounting enabled and stock item,
# then do stock related gl entries
if auto_inventory_accounting and item.delivery_note and \
@@ -682,22 +683,23 @@
item.dn_detail, "purchase_rate")
valuation_amount = purchase_rate * item.qty
# expense account gl entries
- gl_entries.append(
- self.get_gl_dict({
- "account": item.expense_account,
- "against": "Stock Delivered But Not Billed - %s" % (abbr,),
- "debit": valuation_amount,
- "remarks": self.doc.remarks or "Accounting Entry for Stock"
- }, is_cancel)
- )
- gl_entries.append(
- self.get_gl_dict({
- "account": "Stock Delivered But Not Billed - %s" % (abbr,),
- "against": item.expense_account,
- "credit": valuation_amount,
- "remarks": self.doc.remarks or "Accounting Entry for Stock"
- }, is_cancel)
- )
+ if flt(valuation_amount):
+ gl_entries.append(
+ self.get_gl_dict({
+ "account": item.expense_account,
+ "against": "Stock Delivered But Not Billed - %s" % (abbr,),
+ "debit": valuation_amount,
+ "remarks": self.doc.remarks or "Accounting Entry for Stock"
+ }, is_cancel)
+ )
+ gl_entries.append(
+ self.get_gl_dict({
+ "account": "Stock Delivered But Not Billed - %s" % (abbr,),
+ "against": item.expense_account,
+ "credit": valuation_amount,
+ "remarks": self.doc.remarks or "Accounting Entry for Stock"
+ }, is_cancel)
+ )
if self.doc.is_pos and self.doc.cash_bank_account and self.doc.paid_amount:
# POS, make payment entries
gl_entries.append(