| commit | 760bfb27d009832a0c49df230d6e566d3bd4df30 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Thu Aug 13 14:14:26 2015 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Thu Aug 13 14:14:26 2015 +0530 |
| tree | fb0367e12fc94dc46bf7b7bbebd45a5f0837729c | |
| parent | c0c4e866bed26cb8ac900fb488abdffc468e019d [diff] | |
| parent | ff04bf63460e4e185d61680bd913ba7a1c07c12c [diff] |
Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 62f5b88..89dea2e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -98,7 +98,7 @@ if f in ["stock_uom", "conversion_factor"] or not item.get(f): item.set(f, item_details.get(f)) - if self.difference_account: + if self.difference_account and item.expense_account=="": item.expense_account = self.difference_account if not item.transfer_qty: